Adding Caching, limits for template handling
Version bump