Merge pull request #14 from apache/caffeine

Replace ehcache with caffeine