Tweaks to caching