Merge "Fix prefetchChangesCacheSize breakage"