Fixes and bump in ehcache version

Each commit says what it does pretty well. This merge request includes a fix for failing unit tests, the addition of a new configuration option (reloadable), and a bump in the ehcache version.