Clip measureLineCache size and length
Revert unrelated changes