Fixed caching of templates
Fixed variants of merged assets