Porting fix done for CARBON-14838 to Git
Merge branch 'master' of https://github.com/amilad/carbon4-kernel into amilad-master
Optimized cacheImpl imports
Merge branch 'amilad-master'