Updates for production caching