Fix caching issue