fix caching issues