Fix template cache compiler bug
Merge branch 'fix-template-cache-compiler-bug'