fixed Bug with caching layout (#5)
Fixed problem with disabling module (#6)
Merge branch 'hotfix/caching'
Merge branch 'hotfix/disabled_modulu'