More bulletproof caching