Tweaks to xml cacher