@@ -112,6 +112,8 @@ Python 3.9, the following collections become generic using
 * ``collections.abc.ValuesView``
 * ``contextlib.AbstractContextManager``  # typing.ContextManager
 * ``contextlib.AbstractAsyncContextManager``  # typing.AsyncContextManager
+* ``re.Pattern``  # typing.Pattern, typing.re.Pattern
+* ``re.Match``  # typing.Match, typing.re.Match
 
 Importing those from ``typing`` is deprecated.  Due to PEP 563 and the
 intention to minimize the runtime impact of typing, this deprecation
@@ -150,10 +152,13 @@ exceptions:
 * the ``__repr__`` shows the parametrized type;
 * the ``__origin__`` attribute points at the non-parametrized
   generic class;
-* the ``__parameters__`` attribute is a tuple (possibly of length
+* the ``__args__`` attribute is a tuple (possibly of length
   1) of generic types passed to the original ``__class_getitem__``;
-* the ``__class_getitem__`` raises an exception to disallow mistakes
-  like ``dict[str][str]``.
+* the ``__parameters__`` attribute is a lazily computed tuple
+  (possibly empty) of unique type variables found in ``__args__``;
+* the ``__getitem__`` raises an exception to disallow mistakes
+  like ``dict[str][str]``.  However it allows e.g. ``dict[str, T][int]``
+  and in that case returns ``dict[str, int]``.
 
 This design means that it is possible to create instances of
 parametrized collections, like::
@@ -165,7 +170,11 @@ parametrized collections, like::
     >>> list is list[str]
     False
     >>> list == list[str]
+    False
+    >>> list[str] == list[str]
     True
+    >>> list[str] == list[int]
+    False
 
 Objects created with bare types and parametrized types are exactly the
 same.  The generic parameters are not preserved in instances created
@@ -182,13 +191,26 @@ and::
 
     l = list[str]()
 
+For accessing the proxy type from Python code, it will be exported
+from the ``types`` module as ``GenericAlias``.
+
+Pickling or (shallow- or deep-) copying a ``GenericAlias`` instance
+will preserve the type, origin, attributes and parameters.
+
 
 Forward compatibility
 ---------------------
 
 Future standard collections must implement the same behavior.
 
 
+Reference implementation
+========================
+
+A proof-of-concept or prototype `implementation
+<https://bugs.python.org/issue39481>`__ exists.
+
+
 Rejected alternatives
 =====================
 
@@ -261,7 +283,7 @@ Disallowing instantiation of parametrized types
 -----------------------------------------------
 
 Given that the proxy type which preserves ``__origin__`` and
-``__parameters__`` is mostly useful for runtime introspection purposes,
+``__args__`` is mostly useful for runtime introspection purposes,
 we might have disallowed instantiation of parametrized types.
 
 In fact, forbidding instantiation of parametrized types is what the