Greatly improved caching speed