diff --git a/core/modules/action/action.routing.yml b/core/modules/action/action.routing.yml
index 19e1703..1a134e5 100644
--- a/core/modules/action/action.routing.yml
+++ b/core/modules/action/action.routing.yml
@@ -18,6 +18,10 @@ action_admin_configure:
     _entity_form: 'action.edit'
   requirements:
     _permission: 'administer actions'
+  options:
+    parameters:
+      action:
+        type: 'entity:action'
 
 action_delete:
   pattern: 'admin/config/system/actions/configure/{action}/delete'
@@ -25,4 +29,8 @@ action_delete:
     _entity_form: 'action.delete'
   requirements:
     _permission: 'administer actions'
+  options:
+    parameters:
+      action:
+        type: 'entity:action'
 
diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml
index 2c69045..96ba963 100644
--- a/core/modules/aggregator/aggregator.routing.yml
+++ b/core/modules/aggregator/aggregator.routing.yml
@@ -18,6 +18,10 @@ aggregator_feed_items_delete:
     _entity_form: 'aggregator_feed.remove_items'
   requirements:
     _permission: 'administer news feeds'
+  options:
+    parameters:
+      aggregator_feed:
+        type: 'entity:aggregator_feed'
 
 aggregator_feed_delete:
   pattern: '/admin/config/services/aggregator/delete/feed/{aggregator_feed}'
@@ -25,6 +29,10 @@ aggregator_feed_delete:
     _entity_form: 'aggregator_feed.delete'
   requirements:
     _permission: 'administer news feeds'
+  options:
+    parameters:
+      aggregator_feed:
+        type: 'entity:aggregator_feed'
 
 aggregator_feed_add:
   pattern: '/admin/config/services/aggregator/add/feed'
@@ -39,6 +47,10 @@ aggregator_feed_refresh:
     _controller: '\Drupal\aggregator\Controller\AggregatorController::feedRefresh'
   requirements:
     _permission: 'administer news feeds'
+  options:
+    parameters:
+      aggregator_feed:
+        type: 'entity:aggregator_feed'
 
 aggregator_opml_add:
   pattern: '/admin/config/services/aggregator/add/opml'
diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml
index cabd4cb..a25b667 100644
--- a/core/modules/block/block.routing.yml
+++ b/core/modules/block/block.routing.yml
@@ -4,6 +4,10 @@ block_admin_block_delete:
     _entity_form: 'block.delete'
   requirements:
     _permission: 'administer blocks'
+  options:
+    parameters:
+      block:
+        type: 'entity:block'
 
 block_admin_edit:
   pattern: '/admin/structure/block/manage/{block}'
@@ -11,6 +15,10 @@ block_admin_edit:
     _entity_form: 'block.default'
   requirements:
     _entity_access: 'block.update'
+  options:
+    parameters:
+      block:
+        type: 'entity:block'
 
 block_admin_display:
   pattern: '/admin/structure/block'
diff --git a/core/modules/block/custom_block/custom_block.routing.yml b/core/modules/block/custom_block/custom_block.routing.yml
index 2178d91..2702b86 100644
--- a/core/modules/block/custom_block/custom_block.routing.yml
+++ b/core/modules/block/custom_block/custom_block.routing.yml
@@ -18,6 +18,10 @@ custom_block_add_form:
     _content: 'Drupal\custom_block\Controller\CustomBlockController::addForm'
   requirements:
     _permission: 'administer blocks'
+  options:
+    parameters:
+      custom_block_type:
+        type: 'entity:custom_block_type'
 
 custom_block_type_delete:
   pattern: '/admin/structure/custom-blocks/manage/{custom_block_type}/delete'
@@ -25,3 +29,7 @@ custom_block_type_delete:
     _entity_form: 'custom_block_type.delete'
   requirements:
     _permission: 'administer blocks'
+  options:
+    parameters:
+      custom_block_type:
+        type: 'entity:custom_block_type'
diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml
index b62c118..0c86816 100644
--- a/core/modules/comment/comment.routing.yml
+++ b/core/modules/comment/comment.routing.yml
@@ -4,6 +4,10 @@ comment_edit_page:
     _entity_form: 'comment.default'
   requirements:
     _entity_access: 'comment.update'
+  options:
+    parameters:
+      comment:
+        type: 'entity:comment'
 
 comment_approve:
   pattern: '/comment/{comment}/approve'
@@ -12,6 +16,10 @@ comment_approve:
     entity_type: 'comment'
   requirements:
     _entity_access: 'comment.approve'
+  options:
+    parameters:
+      comment:
+        type: 'entity:comment'
 
 comment_permalink:
   pattern: '/comment/{comment}'
@@ -19,3 +27,7 @@ comment_permalink:
     _controller: '\Drupal\comment\Controller\CommentController::commentPermalink'
   requirements:
     _entity_access: 'comment.view'
+  options:
+    parameters:
+      comment:
+        type: 'entity:comment'
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index ba47a6a..dfe6195 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -4,6 +4,10 @@ contact_category_delete:
     _entity_form: contact_category.delete
   requirements:
     _entity_access: contact_category.delete
+  options:
+    parameters:
+      contact_category:
+        type: 'entity:contact_category'
 
 contact_category_list:
   pattern: '/admin/structure/contact'
@@ -25,3 +29,7 @@ contact_category_edit:
     _entity_form: contact_category.edit
   requirements:
     _entity_access: contact_category.update
+  options:
+    parameters:
+      contact_category:
+        type: 'entity:contact_category'
diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml
index 05d7092..f1b5646 100644
--- a/core/modules/entity/entity.routing.yml
+++ b/core/modules/entity/entity.routing.yml
@@ -25,6 +25,10 @@ entity_view_mode.edit:
     _entity_form: 'view_mode.edit'
   requirements:
     _entity_access: 'view_mode.update'
+  options:
+    parameters:
+      view_mode:
+        type: 'entity:view_mode'
 
 entity_view_mode.delete:
   pattern: '/admin/structure/display-modes/view/manage/{view_mode}/delete'
@@ -32,6 +36,10 @@ entity_view_mode.delete:
     _entity_form: 'view_mode.delete'
   requirements:
     _entity_access: 'view_mode.delete'
+  options:
+    parameters:
+      view_mode:
+        type: 'entity:view_mode'
 
 entity_form_mode.list:
   pattern: '/admin/structure/display-modes/form'
@@ -60,6 +68,10 @@ entity_form_mode.edit:
     _entity_form: 'form_mode.edit'
   requirements:
     _entity_access: 'form_mode.update'
+  options:
+    parameters:
+      form_mode:
+        type: 'entity:form_mode'
 
 entity_form_mode.delete:
   pattern: '/admin/structure/display-modes/form/manage/{form_mode}/delete'
@@ -67,3 +79,7 @@ entity_form_mode.delete:
     _entity_form: 'form_mode.delete'
   requirements:
     _entity_access: 'form_mode.delete'
+  options:
+    parameters:
+      form_mode:
+        type: 'entity:form_mode'
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php b/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php
index e994202..0810530 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php
@@ -56,21 +56,30 @@ public function routes(RouteBuildEvent $event) {
         $route = new Route(
           "$path/fields/{field_instance}",
           array('_form' => '\Drupal\field_ui\Form\FieldInstanceEditForm'),
-          array('_permission' => 'administer ' . $entity_type . ' fields')
+          array('_permission' => 'administer ' . $entity_type . ' fields'),
+          array('parameters' => array(
+            'field_instance' => array('type' => 'entity:field_instance'),
+          ))
         );
         $collection->add("field_ui.instance_edit.$entity_type", $route);
 
         $route = new Route(
           "$path/fields/{field_instance}/field",
           array('_form' => '\Drupal\field_ui\Form\FieldEditForm'),
-          array('_permission' => 'administer ' . $entity_type . ' fields')
+          array('_permission' => 'administer ' . $entity_type . ' fields'),
+          array('parameters' => array(
+            'field_instance' => array('type' => 'entity:field_instance'),
+          ))
         );
         $collection->add("field_ui.field_edit.$entity_type", $route);
 
         $route = new Route(
           "$path/fields/{field_instance}/delete",
           array('_entity_form' => 'field_instance.delete'),
-          array('_permission' => 'administer ' . $entity_type . ' fields')
+          array('_permission' => 'administer ' . $entity_type . ' fields'),
+          array('parameters' => array(
+            'field_instance' => array('type' => 'entity:field_instance'),
+          ))
         );
         $collection->add("field_ui.delete.$entity_type", $route);
 
diff --git a/core/modules/filter/filter.routing.yml b/core/modules/filter/filter.routing.yml
index 5442fb0..194182d 100644
--- a/core/modules/filter/filter.routing.yml
+++ b/core/modules/filter/filter.routing.yml
@@ -11,6 +11,10 @@ filter_tips:
     _content: '\Drupal\filter\Controller\FilterController::filterTips'
   requirements:
     _filter_access: 'TRUE'
+  options:
+    parameters:
+      filter_format:
+        type: 'entity:filter_format'
 
 filter_admin_overview:
   pattern: '/admin/config/content/formats'
@@ -33,6 +37,10 @@ filter_format_edit:
     _entity_form: filter_format.edit
   requirements:
     _permission: 'administer filters'
+  options:
+    parameters:
+      filter_format:
+        type: 'entity:filter_format'
 
 filter_admin_disable:
   pattern: '/admin/config/content/formats/manage/{filter_format}/disable'
@@ -40,3 +48,7 @@ filter_admin_disable:
     _entity_form: 'filter_format.disable'
   requirements:
     _filter_disable_format_access: 'TRUE'
+  options:
+    parameters:
+      filter_format:
+        type: 'entity:filter_format'
diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml
index f7d90f8..980d830 100644
--- a/core/modules/forum/forum.routing.yml
+++ b/core/modules/forum/forum.routing.yml
@@ -4,6 +4,11 @@ forum_delete:
     _form: 'Drupal\forum\Form\DeleteForm'
   requirements:
     _permission: 'administer forums'
+  options:
+    parameters:
+      taxonomy_term:
+        type: 'entity:taxonomy_term'
+
 forum_settings:
   pattern: '/admin/structure/forum/settings'
   defaults:
diff --git a/core/modules/image/image.routing.yml b/core/modules/image/image.routing.yml
index b178d33..dc49706 100644
--- a/core/modules/image/image.routing.yml
+++ b/core/modules/image/image.routing.yml
@@ -4,6 +4,10 @@ image_style_delete:
     _entity_form: 'image_style.delete'
   requirements:
     _permission: 'administer image styles'
+  options:
+    parameters:
+      image_style:
+        type: 'entity:image_style'
 
 image_effect_delete:
   pattern: 'admin/config/media/image-styles/manage/{image_style}/effects/{image_effect}/delete'
@@ -11,3 +15,7 @@ image_effect_delete:
     _form: '\Drupal\image\Form\ImageEffectDeleteForm'
   requirements:
     _permission: 'administer image styles'
+  options:
+    parameters:
+      image_style:
+        type: 'entity:image_style'
diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml
index 62c54f2..c938647 100644
--- a/core/modules/menu/menu.routing.yml
+++ b/core/modules/menu/menu.routing.yml
@@ -11,6 +11,10 @@ menu_link_reset:
     _entity_form: 'menu_link.reset'
   requirements:
     _permission: 'administer menu'
+  options:
+    parameters:
+      menu_link:
+        type: 'entity:menu_link'
 
 menu_link_delete:
   pattern: 'admin/structure/menu/item/{menu_link}/delete'
@@ -18,6 +22,10 @@ menu_link_delete:
     _entity_form: 'menu_link.delete'
   requirements:
     _access_menu_delete_link: 'TRUE'
+  options:
+    parameters:
+      menu_link:
+        type: 'entity:menu_link'
 
 menu_delete_menu:
   pattern: 'admin/structure/menu/manage/{menu}/delete'
@@ -25,3 +33,7 @@ menu_delete_menu:
     _entity_form: 'menu.delete'
   requirements:
     _access_menu_delete_menu: 'TRUE'
+  options:
+    parameters:
+      menu:
+        type: 'entity:menu'
diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml
index dfdc0a6..266e0ab 100644
--- a/core/modules/node/node.routing.yml
+++ b/core/modules/node/node.routing.yml
@@ -11,6 +11,10 @@ node_page_edit:
     _entity_form: 'node.edit'
   requirements:
     _entity_access: 'node.update'
+  options:
+    parameters:
+      node:
+        type: 'entity:node'
 
 node_delete_confirm:
   pattern: '/node/{node}/delete'
@@ -18,6 +22,10 @@ node_delete_confirm:
     _entity_form: 'node.delete'
   requirements:
     _entity_access: 'node.delete'
+  options:
+    parameters:
+      node:
+        type: 'entity:node'
 
 node_revision_revert_confirm:
   pattern: '/node/{node}/revisions/{node_revision}/revert'
@@ -25,6 +33,10 @@ node_revision_revert_confirm:
     _form: '\Drupal\node\Form\NodeRevisionRevertForm'
   requirements:
     _access_node_revision: 'update'
+  options:
+    parameters:
+      node:
+        type: 'entity:node'
 
 node_revision_delete_confirm:
   pattern: '/node/{node}/revisions/{node_revision}/delete'
@@ -32,6 +44,10 @@ node_revision_delete_confirm:
     _form: '\Drupal\node\Form\NodeRevisionDeleteForm'
   requirements:
     _access_node_revision: 'delete'
+  options:
+    parameters:
+      node:
+        type: 'entity:node'
 
 node_overview_types:
   pattern: '/admin/structure/types'
@@ -54,6 +70,10 @@ node_type_edit:
     _entity_form: 'node_type.edit'
   requirements:
     _permission: 'administer content types'
+  options:
+    parameters:
+      node_type:
+        type: 'entity:node_type'
 
 node_type_edit_default:
   pattern: '/admin/structure/types/manage/{node_type}/edit'
@@ -61,6 +81,10 @@ node_type_edit_default:
     _entity_form: 'node_type.edit'
   requirements:
     _permission: 'administer content types'
+  options:
+    parameters:
+      node_type:
+        type: 'entity:node_type'
 
 node_type_delete_confirm:
   pattern: '/admin/structure/types/manage/{node_type}/delete'
@@ -68,6 +92,10 @@ node_type_delete_confirm:
     _entity_form: 'node_type.delete'
   requirements:
     _entity_access: 'node_type.delete'
+  options:
+    parameters:
+      node_type:
+        type: 'entity:node_type'
 
 node_configure_rebuild_confirm:
   pattern: '/admin/reports/status/rebuild'
diff --git a/core/modules/picture/picture.routing.yml b/core/modules/picture/picture.routing.yml
index c953029..e9f636a 100644
--- a/core/modules/picture/picture.routing.yml
+++ b/core/modules/picture/picture.routing.yml
@@ -18,6 +18,10 @@ picture_mapping_page_edit:
     _entity_form: 'picture_mapping.edit'
   requirements:
     _permission: 'administer pictures'
+  options:
+    parameters:
+      picture_mapping:
+        type: 'entity:picture_mapping'
 
 picture_mapping_page_duplicate:
   pattern: '/admin/config/media/picturemapping/{picture_mapping}/duplicate'
@@ -25,6 +29,10 @@ picture_mapping_page_duplicate:
     _entity_form: 'picture_mapping.duplicate'
   requirements:
     _permission: 'administer pictures'
+  options:
+    parameters:
+      picture_mapping:
+        type: 'entity:picture_mapping'
 
 picture_mapping_action_confirm:
   pattern: '/admin/config/media/picturemapping/{picture_mapping}/delete'
@@ -32,3 +40,7 @@ picture_mapping_action_confirm:
     _entity_form: 'picture_mapping.delete'
   requirements:
     _permission: 'administer pictures'
+  options:
+    parameters:
+      picture_mapping:
+        type: 'entity:picture_mapping'
diff --git a/core/modules/shortcut/shortcut.routing.yml b/core/modules/shortcut/shortcut.routing.yml
index e6bb718..403da9b 100644
--- a/core/modules/shortcut/shortcut.routing.yml
+++ b/core/modules/shortcut/shortcut.routing.yml
@@ -4,6 +4,10 @@ shortcut_link_delete:
     _form: 'Drupal\shortcut\Form\LinkDelete'
   requirements:
     _access_shortcut_link_delete: 'TRUE'
+  options:
+    parameters:
+      menu_link:
+        type: 'entity:menu_link'
 
 shortcut_set_delete:
   pattern: '/admin/config/user-interface/shortcut/manage/{shortcut}/delete'
@@ -11,6 +15,10 @@ shortcut_set_delete:
     _entity_form: 'shortcut.delete'
   requirements:
     _entity_access: 'shortcut.delete'
+  options:
+    parameters:
+      shortcut:
+        type: 'entity:shortcut'
 
 shortcut_set_admin:
   pattern: '/admin/config/user-interface/shortcut'
@@ -32,6 +40,10 @@ shortcut_set_edit:
     _entity_form: 'shortcut.edit'
   requirements:
     _entity_access: 'shortcut.update'
+  options:
+    parameters:
+      shortcut:
+        type: 'entity:shortcut'
 
 shortcut_link_add_inline:
   pattern: '/admin/config/user-interface/shortcut/manage/{shortcut}/add-link-inline'
@@ -39,6 +51,10 @@ shortcut_link_add_inline:
     _controller: 'Drupal\shortcut\Controller\ShortcutController::addShortcutLinkInline'
   requirements:
     _entity_access: 'shortcut.update'
+  options:
+    parameters:
+      shortcut:
+        type: 'entity:shortcut'
 
 shortcut_set_customize:
   pattern: '/admin/config/user-interface/shortcut/manage/{shortcut}'
@@ -46,3 +62,7 @@ shortcut_set_customize:
     _entity_form: 'shortcut.customize'
   requirements:
     _entity_access: 'shortcut.update'
+  options:
+    parameters:
+      shortcut:
+        type: 'entity:shortcut'
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 301ab6d..7bfb639 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -101,6 +101,10 @@ date_format_edit:
     _entity_form: 'date_format.edit'
   requirements:
     _entity_access: 'date_format.update'
+  options:
+    parameters:
+      date_format:
+        type: 'entity:date_format'
 
 date_format_delete:
   pattern: 'admin/config/regional/date-time/formats/manage/{date_format}/delete'
@@ -108,6 +112,10 @@ date_format_delete:
     _entity_form: 'date_format.delete'
   requirements:
     _entity_access: 'date_format.delete'
+  options:
+    parameters:
+      date_format:
+        type: 'entity:date_format'
 
 date_format_localize_reset:
   pattern: 'admin/config/regional/date-time/locale/{langcode}/reset'
diff --git a/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml b/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml
deleted file mode 100644
index 9d226e4..0000000
--- a/core/modules/system/tests/modules/paramconverter_test/paramconverter_test.routing.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-paramconverter_test_user_node_foo:
-  pattern: '/paramconverter_test/test_user_node_foo/{user}/{node}/{foo}'
-  defaults:
-    _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo'
-  requirements:
-    _access: 'TRUE'
-
-paramconverter_test_node_user_user:
-  pattern: '/paramconverter_test/test_node_user_user/{node}/{foo}/{user}'
-  defaults:
-    _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo'
-  requirements:
-    _access: 'TRUE'
-  options:
-    converters:
-      foo: 'user'
-
-paramconverter_test_node_node_foo:
-  pattern: '/paramconverter_test/test_node_node_foo/{user}/{node}/{foo}'
-  defaults:
-    _content: '\Drupal\paramconverter_test\TestControllers::testUserNodeFoo'
-  requirements:
-    _access: 'TRUE'
-  options:
-    converters:
-      user: 'node'
-
-paramconverter_test_node_set_parent:
-  pattern: '/paramconverter_test/node/{node}/set/parent/{parent}'
-  requirements:
-    _access: 'TRUE'
-  defaults:
-    _content: '\Drupal\paramconverter_test\TestControllers::testNodeSetParent'
-  options:
-    converters:
-      parent: 'node'
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
index 389ca7c..8b15837 100644
--- a/core/modules/taxonomy/taxonomy.routing.yml
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -11,3 +11,7 @@ taxonomy_term_add:
     _content: '\Drupal\taxonomy\Controller\TaxonomyController::addForm'
   requirements:
     _access_taxonomy_term_create: 'taxonomy_term'
+  options:
+    parameters:
+      taxonomy_vocabulary:
+        type: 'entity:taxonomy_vocabulary'
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index 10ec95d..2235bca 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -60,6 +60,10 @@ user_role_edit:
     _entity_form: user_role.default
   requirements:
     _entity_access: user_role.update
+  options:
+    parameters:
+      user_role:
+        type: 'entity:user_role'
 
 user_role_delete:
   pattern: '/admin/people/roles/manage/{user_role}/delete'
@@ -67,6 +71,10 @@ user_role_delete:
     _entity_form: user_role.delete
   requirements:
     _entity_access: user_role.delete
+  options:
+    parameters:
+      user_role:
+        type: 'entity:user_role'
 
 user_pass:
   pattern: '/user/password'
diff --git a/core/modules/views_ui/views_ui.routing.yml b/core/modules/views_ui/views_ui.routing.yml
index 0d44630..d0d55ee 100644
--- a/core/modules/views_ui/views_ui.routing.yml
+++ b/core/modules/views_ui/views_ui.routing.yml
@@ -47,6 +47,10 @@ views_ui.operation:
   requirements:
     _permission: 'administer views'
     op: 'enable|disable'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
 
 views_ui.clone:
   pattern: '/admin/structure/views/view/{view}/clone'
@@ -54,6 +58,10 @@ views_ui.clone:
     _entity_form: 'view.clone'
   requirements:
     _permission: 'administer views'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
 
 views_ui.delete:
   pattern: '/admin/structure/views/view/{view}/delete'
@@ -61,6 +69,10 @@ views_ui.delete:
     _entity_form: 'view.delete'
   requirements:
     _permission: 'administer views'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
 
 views_ui.autocomplete:
   pattern: '/admin/views/ajax/autocomplete/tag'
@@ -71,35 +83,41 @@ views_ui.autocomplete:
 
 views_ui.edit:
   pattern: '/admin/structure/views/view/{view}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Controller\ViewsUIController::edit'
   requirements:
     _permission: 'administer views'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.edit.display:
   pattern: '/admin/structure/views/view/{view}/edit/{display_id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Controller\ViewsUIController::edit'
     display_id: NULL
   requirements:
     _permission: 'administer views'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.preview:
   pattern: '/admin/structure/views/view/{view}/preview/{display_id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _entity_form: 'view.preview'
     display_id: NULL
   requirements:
     _permission: 'administer views'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.breakLock:
   pattern: '/admin/structure/views/view/{view}/break-lock'
@@ -107,114 +125,138 @@ views_ui.breakLock:
     _entity_form: 'view.break_lock'
   requirements:
     _permission: 'administer views'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
 
 views_ui.form.addItem:
   pattern: '/admin/structure/views/{js}/add-item/{view}/{display_id}/{type}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\AddItem::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.editDetails:
   pattern: '/admin/structure/views/{js}/edit-details/{view}/{display_id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\EditDetails::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.reorderDisplays:
   pattern: '/admin/structure/views/{js}/reorder-displays/{view}/{display_id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\ReorderDisplays::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.analyze:
   pattern: '/admin/structure/views/{js}/analyze/{view}/{display_id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\Analyze::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.rearrange:
   pattern: '/admin/structure/views/{js}/rearrange/{view}/{display_id}/{type}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\Rearrange::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.rearrangeFilter:
   pattern: '/admin/structure/views/{js}/rearrange-filter/{view}/{display_id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\RearrangeFilter::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.display:
   pattern: '/admin/structure/views/{js}/display/{view}/{display_id}/{type}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\Display::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.configItem:
   pattern: '/admin/structure/views/{js}/config-item/{view}/{display_id}/{type}/{id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\ConfigItem::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.configItemExtra:
   pattern: '/admin/structure/views/{js}/config-item-extra/{view}/{display_id}/{type}/{id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\ConfigItemExtra::getForm'
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'
 
 views_ui.form.configItemGroup:
   pattern: '/admin/structure/views/{js}/config-item-group/{view}/{display_id}/{type}/{id}'
-  options:
-    tempstore:
-      view: 'views'
   defaults:
     _controller: '\Drupal\views_ui\Form\Ajax\ConfigItemGroup::getForm'
     form_state: NULL
   requirements:
     _permission: 'administer views'
     js: 'nojs|ajax'
+  options:
+    parameters:
+      view:
+        type: 'entity:view'
+        class: '\Drupal\views_ui\ViewUI'