fix caching