Polish Generics and Update Spring Version

We needed to update Spring Version to avoid
https://jira.spring.io/browse/SPR-11471