MDL-38565 cache: tidy up pre-integration