Cache layer rework