diff --git a/src/vs/workbench/browser/parts/editor/stringEditor.ts b/src/vs/workbench/browser/parts/editor/stringEditor.ts
index 1654fc95136..dbe016509b4 100644
--- a/src/vs/workbench/browser/parts/editor/stringEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/stringEditor.ts
@@ -107,7 +107,7 @@ export class StringEditor extends BaseTextEditor {
 
 			// Set Editor Model
 			const textEditor = this.getControl();
-			const textEditorModel = (<BaseTextEditorModel>resolvedModel).textEditorModel;
+			const textEditorModel = resolvedModel.textEditorModel;
 			textEditor.setModel(textEditorModel);
 
 			// Apply Options from TextOptions
diff --git a/src/vs/workbench/common/editor/diffEditorModel.ts b/src/vs/workbench/common/editor/diffEditorModel.ts
index 5569b6c888a..e12b560ef53 100644
--- a/src/vs/workbench/common/editor/diffEditorModel.ts
+++ b/src/vs/workbench/common/editor/diffEditorModel.ts
@@ -12,8 +12,8 @@ import { EditorModel } from 'vs/workbench/common/editor';
  * and the modified version.
  */
 export class DiffEditorModel extends EditorModel {
-	private _originalModel: EditorModel;
-	private _modifiedModel: EditorModel;
+	protected _originalModel: EditorModel;
+	protected _modifiedModel: EditorModel;
 
 	constructor(originalModel: EditorModel, modifiedModel: EditorModel) {
 		super();
diff --git a/src/vs/workbench/common/editor/textDiffEditorModel.ts b/src/vs/workbench/common/editor/textDiffEditorModel.ts
index 10738e61a61..dc199593c22 100644
--- a/src/vs/workbench/common/editor/textDiffEditorModel.ts
+++ b/src/vs/workbench/common/editor/textDiffEditorModel.ts
@@ -23,6 +23,14 @@ export class TextDiffEditorModel extends DiffEditorModel {
 		this.updateTextDiffEditorModel();
 	}
 
+	get originalModel(): BaseTextEditorModel {
+		return this._originalModel as BaseTextEditorModel;
+	}
+
+	get modifiedModel(): BaseTextEditorModel {
+		return this._modifiedModel as BaseTextEditorModel;
+	}
+
 	public load(): TPromise<EditorModel> {
 		return super.load().then(() => {
 			this.updateTextDiffEditorModel();
@@ -37,15 +45,15 @@ export class TextDiffEditorModel extends DiffEditorModel {
 			// Create new
 			if (!this._textDiffEditorModel) {
 				this._textDiffEditorModel = {
-					original: (<BaseTextEditorModel>this.originalModel).textEditorModel,
-					modified: (<BaseTextEditorModel>this.modifiedModel).textEditorModel
+					original: this.originalModel.textEditorModel,
+					modified: this.modifiedModel.textEditorModel
 				};
 			}
 
 			// Update existing
 			else {
-				this._textDiffEditorModel.original = (<BaseTextEditorModel>this.originalModel).textEditorModel;
-				this._textDiffEditorModel.modified = (<BaseTextEditorModel>this.modifiedModel).textEditorModel;
+				this._textDiffEditorModel.original = this.originalModel.textEditorModel;
+				this._textDiffEditorModel.modified = this.modifiedModel.textEditorModel;
 			}
 		}
 	}
diff --git a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
index 5f09abac3ae..c9d92e66373 100644
--- a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
@@ -83,7 +83,7 @@ suite('Workbench - TextModelResolverService', () => {
 		(<TextFileEditorModelManager>accessor.textFileService.models).add(model.getResource(), model);
 		model.load().then(() => {
 			accessor.textModelResolverServie.resolve(model.getResource()).then(model => {
-				const editorModel = model.textEditorModel as IModel;
+				const editorModel = model.textEditorModel;
 
 				assert.ok(editorModel);
 				assert.equal(editorModel.getValue(), 'Hello Html');
@@ -99,7 +99,7 @@ suite('Workbench - TextModelResolverService', () => {
 
 		input.resolve().then(() => {
 			accessor.textModelResolverServie.resolve(input.getResource()).then(model => {
-				const editorModel = model.textEditorModel as IModel;
+				const editorModel = model.textEditorModel;
 
 				assert.ok(editorModel);