Refactor providers to be bound to the injector on demand