Add caching for production