SONAR-2657 Fix circular dependency in IoC container