Fix XmlGeneratorTest on Windows
Fix baseline startup after removal of caching dep.
Merge remote-tracking branch 'origin/master'