Ah, right.
Delegation seems the appropriate way and UserType needs to implement equals and hashCode. For use, the implementation would just be to compare the class in equals and base hashCode on class(name).

How do you want to continue? Can you create the fix based on our patch? Shall we correct the patch? Should we create a pull request?