Revert stupid jinja1 style caching from a60d87b and just do things properly