#64 Breaking a dependency cycle by using discovery instead of direct injection