Removed attrs from GenericModule - it was confusing
Added caching and error handling to QueryMediator