As there are very few spots in our code base, removing Generics from the fields and doing an explicit cast in the getters is fine for me, but thanks for the hint.