Improve cache interactions