Improved caching system