CacheProxy refactored, cleaned up
CacheProxy refactored, cleaned up, (review)
Merge pull request #3550 from asimarslan/feature/master/jcache-master

Feature/master/jcache master