Improvements
Improved the caching mechanism