Spring suddenly has cyclic dependencies after switching to new ...