Improvements for cases cache