Update service provider, since we need to separate defer and eager when having package() registration.

Signed-off-by: crynobone <crynobone@gmail.com>