Fixed caching issue