Rework caching integration.