FIX TemplateManifest prevent cache collision
Merge pull request #3095 from willmorgan/pulls/templatemanifest-cache-fix

FIX TemplateManifest prevent cache collision