Added infinispan support