Fixing caching issue