Resolve a TODO item: allow ModelExtensions to be injected as singletons