Made both Twig caches clear until I figure out a better way to differentiate
Merge branch 'magicmonkey-twig-cache-clear-all'