Cache improvements.