Caching tweaks