Reorganized caching