Improve cache sweepers