diff -Naur infinispan-5.1.2.FINAL/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java infinispan-5.1.2.FINAL-work/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java
--- infinispan-5.1.2.FINAL/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java	2012-03-02 09:14:01.000000000 -0500
+++ infinispan-5.1.2.FINAL-work/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshaller.java	2012-03-22 15:22:27.912999490 -0500
@@ -26,7 +26,8 @@
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.io.BinaryEncoder;
+import org.apache.avro.io.EncoderFactory;
+import org.apache.avro.io.DirectBinaryEncoder;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.Encoder;
@@ -125,7 +126,8 @@
    @Override
    protected ByteBuffer objectToBuffer(Object o, int estimatedSize) throws IOException {
       ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(estimatedSize);
-      Encoder encoder = new BinaryEncoder(baos);
+      EncoderFactory factory = EncoderFactory.get();
+      Encoder encoder = factory.binaryEncoder(baos, null);
       objectToBuffer(o, encoder);
       return new ByteBuffer(baos.getRawBuffer(), 0, baos.size());
    }