Refactoring caches.