> Wont this be unneeded once we have the proper DI container to access to oc apis? 

for sure - I'm not yet finally where I want to be - but thanks for keeping a close eye