caching issues fix