FIX TemplateManifest prevent cache collision