Merge "Ensure that ScanInfo is cached before callbacks fire"