I've been using a static ThreadLocal in the org.hibernate.ogm.datastore.infinispanremote.impl.protostream.OgmProtoStreamMarshaller implementation to workaround limitation of the mapping via ProtoStream.

First, we need to discuss API change proposals to improve ProtoStream

Second, I believe that with some refactoring we could at least make this a non-static ThreadLocal with some care in how the custom serializer is being injected in the Hot Rod client.