* Fix more recursive generics on factory methods See https://jira.spring.io/browse/INT-4458 **Cherry-pick to 5.0.x**