Added surround with t and cache templates.