MDL-45678 cache: renamed new cache and better comments