DI 2.0.0

minor: use `key(type)` here and below