cleans up template caching and removes caching from data criteria
Merge pull request #196 from projectcypress/fix_template_caching

cleans up template caching and removes caching from data criteria