Final caching fix