EhCache plugin refactoring
Merge pull request #871 from akalinovskiy/master

EhCachePlugin refactoring