diff --git a/src/vs/workbench/api/common/extHostDocumentData.ts b/src/vs/workbench/api/common/extHostDocumentData.ts
index 064cbbb0426db2fd3040a0c6e1ae0b81fb61b55d..28e76f2a267b0273a51391ffef8b6a768b683f0b 100644
--- a/src/vs/workbench/api/common/extHostDocumentData.ts
+++ b/src/vs/workbench/api/common/extHostDocumentData.ts
@@ -28,7 +28,6 @@ export class ExtHostDocumentData extends MirrorTextModel {
 	private _languageId: string;
 	private _isDirty: boolean;
 	private _document?: vscode.TextDocument;
-	private _textLines: vscode.TextLine[] = [];
 	private _isDisposed: boolean = false;
 
 	constructor(proxy: MainThreadDocumentsShape, uri: URI, lines: string[], eol: string,
@@ -130,33 +129,11 @@ export class ExtHostDocumentData extends MirrorTextModel {
 			line = lineOrPosition;
 		}
 
-		if (typeof line !== 'number' || line < 0 || line >= this._lines.length) {
+		if (typeof line !== 'number' || line < 0 || line >= this._lines.length || Math.floor(line) !== line) {
 			throw new Error('Illegal value for `line`');
 		}
 
-		let result = this._textLines[line];
-		if (!result || result.lineNumber !== line || result.text !== this._lines[line]) {
-
-			const text = this._lines[line];
-			const firstNonWhitespaceCharacterIndex = /^(\s*)/.exec(text)![1].length;
-			const range = new Range(line, 0, line, text.length);
-			const rangeIncludingLineBreak = line < this._lines.length - 1
-				? new Range(line, 0, line + 1, 0)
-				: range;
-
-			result = Object.freeze({
-				lineNumber: line,
-				range,
-				rangeIncludingLineBreak,
-				text,
-				firstNonWhitespaceCharacterIndex, //TODO@api, rename to 'leadingWhitespaceLength'
-				isEmptyOrWhitespace: firstNonWhitespaceCharacterIndex === text.length
-			});
-
-			this._textLines[line] = result;
-		}
-
-		return result;
+		return new ExtHostDocumentLine(line, this._lines[line], line === this._lines.length - 1);
 	}
 
 	private _offsetAt(position: vscode.Position): number {
@@ -255,3 +232,44 @@ export class ExtHostDocumentData extends MirrorTextModel {
 		return undefined;
 	}
 }
+
+class ExtHostDocumentLine implements vscode.TextLine {
+
+	private readonly _line: number;
+	private readonly _text: string;
+	private readonly _isLastLine: boolean;
+
+	constructor(line: number, text: string, isLastLine: boolean) {
+		this._line = line;
+		this._text = text;
+		this._isLastLine = isLastLine;
+	}
+
+	public get lineNumber(): number {
+		return this._line;
+	}
+
+	public get text(): string {
+		return this._text;
+	}
+
+	public get range(): Range {
+		return new Range(this._line, 0, this._line, this._text.length);
+	}
+
+	public get rangeIncludingLineBreak(): Range {
+		if (this._isLastLine) {
+			return this.range;
+		}
+		return new Range(this._line, 0, this._line + 1, 0);
+	}
+
+	public get firstNonWhitespaceCharacterIndex(): number {
+		//TODO@api, rename to 'leadingWhitespaceLength'
+		return /^(\s*)/.exec(this._text)![1].length;
+	}
+
+	public get isEmptyOrWhitespace(): boolean {
+		return this.firstNonWhitespaceCharacterIndex === this._text.length;
+	}
+}