Adjusting dependencies to avoid cyclic spring injection