Changed caching and filtering of modules