Merge branch 'release/0.3.1' into develop
Cache more templates
Prep for release
Merge branch 'release/0.3.2'