Improvements to reduce caching speed