Dependency injection circular reference correction