EhCache plugin refactoring