diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntity/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntity/0.kt
index 649d937d4e4..6767fb65b82 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntity/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntity/0.kt
@@ -20,8 +20,8 @@ class MyActivity(): Activity() {
     val loginItem = Button(this)
 
     val entity = MyEntity(object : FrameLayout(this) {
-        override fun findViewById(id: Int) : View? = when(id) {
-            R.id.login -> loginItem
+        override fun <T : View> findViewById(id: Int): T? = when(id) {
+            R.id.login -> loginItem as T
             else -> null
         }
     })
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntityInnerClass/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntityInnerClass/0.kt
index d8e27fe7013..9ffdc4a29b0 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntityInnerClass/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/androidEntityInnerClass/0.kt
@@ -18,8 +18,8 @@ class MyActivity(): Activity() {
     val loginItem = Button(this)
 
     val entity = MyEntity(object : FrameLayout(this) {
-        override fun findViewById(id: Int) : View? = when(id) {
-            R.id.login -> loginItem
+        override fun <T : View> findViewById(id: Int): T? = when(id) {
+            R.id.login -> loginItem as T
             else -> null
         }
     })
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/0.kt
index e0792a5fa4a..c04731acc12 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/0.kt
@@ -17,9 +17,9 @@ class R {
 class MyActivity(): Activity() {
     val buttonWidget = MyButton(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.login -> buttonWidget
+            R.id.login -> buttonWidget as T
             else -> null
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/1.kt
index 38918000b52..f0a5fa74108 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/1.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/1.kt
@@ -17,9 +17,9 @@ class R {
 class MyActivity(): Activity() {
     val buttonWidget = MyButton(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.login -> buttonWidget
+            R.id.login -> buttonWidget as T
             else -> null
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/0.kt
index e0792a5fa4a..c04731acc12 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/0.kt
@@ -17,9 +17,9 @@ class R {
 class MyActivity(): Activity() {
     val buttonWidget = MyButton(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.login -> buttonWidget
+            R.id.login -> buttonWidget as T
             else -> null
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/1.kt
index 38918000b52..f0a5fa74108 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/1.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/1.kt
@@ -17,9 +17,9 @@ class R {
 class MyActivity(): Activity() {
     val buttonWidget = MyButton(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.login -> buttonWidget
+            R.id.login -> buttonWidget as T
             else -> null
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/0.kt
index 036e3ba7565..cad0605edcc 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/0.kt
@@ -20,9 +20,9 @@ class R {
 class BaseView(ctx: Context) : View(ctx) {
     val buttonWidget = MyButton(ctx)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.login -> buttonWidget
+            R.id.login -> buttonWidget as T
             else -> null
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/0.kt
index a44bd82b99c..8891ef81960 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/0.kt
@@ -30,7 +30,7 @@ class MyActivity(): Activity() {
     val editTextWidget2 = EditText(this)
     val buttonWidget2 = Button(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
             R.id.textView1 -> textViewWidget
             R.id.password -> editTextWidget
@@ -39,7 +39,7 @@ class MyActivity(): Activity() {
             R.id.passwordCaption -> editTextWidget2
             R.id.loginButton -> buttonWidget2
             else -> null
-        }
+        } as T?
     }
 
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/1.kt
index 6955cb3ea26..4546ccfd3dd 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/1.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/1.kt
@@ -24,13 +24,13 @@ class MyActivity(): Activity() {
     val editTextWidget = EditText(this)
     val buttonWidget = Button(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
             R.id.textView1 -> textViewWidget
             R.id.password -> editTextWidget
             R.id.login -> buttonWidget
             else -> null
-        }
+        } as T?
     }
 }
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/0.kt
index 94107f19a03..0bb4797bb91 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/0.kt
@@ -24,13 +24,13 @@ class MyActivity(): Activity() {
     val editTextWidget = EditText(this)
     val buttonWidget = Button(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
             R.id.textView1 -> textViewWidget
             R.id.password -> editTextWidget
             R.id.login -> buttonWidget
             else -> null
-        }
+        } as T?
     }
 
     public fun box(): String {
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/1.kt
index 6898d4558e4..9ec5d20c0eb 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/1.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/1.kt
@@ -23,13 +23,13 @@ class MyActivity(): Activity() {
     val editTextWidget = EditText(this)
     val buttonWidget = Button(this)
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
             R.id.textView1 -> textViewWidget
             R.id.password -> editTextWidget
             R.id.login -> buttonWidget
             else -> null
-        }
+        } as T?
     }
 }
 
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt
index ff6ceea8775..b630e11b6ea 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt
@@ -19,17 +19,17 @@ class MyActivity(): Activity() {
     val containerWidget = object : FrameLayout(this) {
         val loginWidget = Button(this@MyActivity)
 
-        override fun findViewById(id: Int): View? {
+        override fun <T : View> findViewById(id: Int): T? {
             return when (id) {
-                R.id.login -> loginWidget
+                R.id.login -> loginWidget as T
                 else -> null
             }
         }
     }
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.container -> containerWidget
+            R.id.container -> containerWidget as T
             else -> null
         }
     }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt
index c50c38040a2..1187099fc19 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt
@@ -20,9 +20,9 @@ class MyActivity(): Activity() {
         val loginWidget = Button(this@MyActivity)
     }
 
-    override fun findViewById(id: Int): View? {
+    override fun <T : View> findViewById(id: Int): T? {
         return when (id) {
-            R.id.container -> containerWidget
+            R.id.container -> containerWidget as T
             else -> null
         }
     }