Attempt to move from ehcache to JCache+Caffeine
27 files changed