Merge "Enable configuration caching" into main