Ok, I've hijacked http://issues.jboss.org/browse/ISPN-2450 and have issued https://github.com/infinispan/infinispan/pull/1434The pull request is for master. I think it should be applied to branch 5.1.x as well, but I'll let one of you guys test it on 5.1.x first - I have a flight to catch. :)