Improved cache update handling