Various caching updates