Added templates caching