MDL-40903 cache: coding style tidyup pre-integration