Caching before working on new selector tool for templates