Fixed issue with else param in if-component
Cleaning up template caching a bit