BC-1719 EhCache caching