diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2019-11-01/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2019-11-01/storagecache.json
index 30bed164d751..65ee658ffea2 100644
--- a/specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2019-11-01/storagecache.json
+++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2019-11-01/storagecache.json
@@ -266,7 +266,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -325,7 +325,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -386,7 +386,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -456,7 +456,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -518,7 +518,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           }
@@ -579,7 +579,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           }
@@ -640,7 +640,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           }
@@ -701,7 +701,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           }
@@ -758,7 +758,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -825,7 +825,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -888,7 +888,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           },
@@ -965,7 +965,7 @@
             "description": "Name of Cache.",
             "in": "path",
             "name": "cacheName",
-            "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+            "pattern": "^[-0-9a-zA-Z_]{1,80}$",
             "required": true,
             "type": "string"
           }
@@ -1306,7 +1306,7 @@
     },
     "ResourceName": {
       "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate. This will contain the complete URL of the object. These names are case-preserving, but not case sensitive.",
-      "pattern": "^[-0-9a-zA-Z_]{1,31}$",
+      "pattern": "^[-0-9a-zA-Z_]{1,80}$",
       "type": "string"
     },
     "ResourceSku": {
@@ -1434,7 +1434,6 @@
     "StorageTarget": {
       "description": "A storage system being cached by a Cache.",
       "type": "object",
-      "discriminator": "targetType",
       "properties": {
         "name": {
           "description": "Name of the Storage Target.",
@@ -1455,6 +1454,10 @@
           "x-ms-client-flatten": true,
           "description": "Properties of the Storage Target.",
           "type": "object",
+          "discriminator": "targetType",
+          "required": [
+            "targetType"
+          ],
           "properties": {
             "junctions": {
               "description": "List of Cache namespace junctions to target for namespace associations.",