caching fix