Merge "Ensure local settings caches are not stale" into nyc-dev