Fixed caching of bundle & templates