Revert EHCache config
Merge branch 'dev'