Fix error merging issue: use infinispan instead of jbosscache