Make service provider deferred

Not sure if it makes much/any difference but it sounds like a good idea