Added to the caching mechanism
Merge branch 'hotfix-2.3.25'