Fix #8004 - try and fix start line / end line cached node output