Improving the API of GenericsUtil and maintaining the type wrapper classes