Fixed caching issues