Fixes #127.
Merge pull request #129 from frmwrk123/fix/templateCache

Fixes #127.