Upgrade to ehcache 2.8.4