UPD: cache getModulesDisabled, save ~0.08 seconds
UPD: fix previous commit
UPD: small fixes
Merge pull request #1009 from angel-kulikov/master

UPD: small fixes