Merge "TemplateParser: Improve cache integrity check failure scenario"