Feature/infinispan full integ