To avoid using a hack context provider... ;)

Solves a bug in context provider as current context may not be the desired context owning the scope of the desired injected instance.
(Let's see if this passes tests)