some caching tweaks