Merge "Fix a race in local settings caches" into nyc-dev