More clean up around ehCache. Issue #495