For responsiveness, it seems like we'd need some caching for the ModuleDefinitionRepository lookups (if so, that could obviously be a new issue, not necessary to update this PR).