DI 2.0.0

could the first two lists be static ? - they are indexed by `key.id` which is unique.

It would allow:
- saving memory,
- improving perf but sharing the cache