Adding some caching tweaks