I have just submited a pull request about this issue:

https://github.com/infinispan/infinispan/pull/1871

Let me know you what you think about it.

Cheers,

Guillaume