Rework service provider to use `bindShared()` for the locator.