VERSION5.1.109 - Improve caching