Changed caching and filtering of modules
Fixed php cs
Merge pull request #154 from Hounddog/caching_bug_modules

Changed caching and filtering of modules