Fix caching issue in production