Update to the way xml files are cached
Merge branch 'hotfix-2.2.32'