We will probably need a component upgrade in Infinispan incorporating changes in Dan's branch to resolve JBPAPP-9658/AS7-5381 and possibly AS7-5442.
Last release is 5.1.6.Final.