Optimize WFLY-3136 fix.
Merge pull request #6101 from pferraro/infinispan

Optimize WFLY-3136 fix.