Improvements for the cases cache