KRACOEUS-7372: Fixing previous PR. Injecting service instead of using se...

...rvice locator. Pull request to fix previous PR.