"Refactor cache & draw"