From 5f9910dcab6130c8cecb4e2d529cba0cb4d7f5dc Mon Sep 17 00:00:00 2001
From: Justin Black <spacether@users.noreply.github.com>
Date: Wed, 21 Sep 2022 18:41:11 -0700
Subject: [PATCH] [python-experimental] reduces python version (#13481)

* Removes classmethod property combinations

* Changes python version to 3.8

* Changes python version to 3.7

* Tests fixed

* Samples updated

* Adds getAddSuffixToDuplicateOperationNickname and uses it in python-exp, samples regenerated

* test_paths regenerated

* Fixes bug

* Adds typing_extensions requirement
---
 docs/generators/python-experimental.md        |   2 +-
 .../openapitools/codegen/CodegenConfig.java   |   2 +
 .../openapitools/codegen/DefaultCodegen.java  |   6 +
 .../codegen/DefaultGenerator.java             |  20 +--
 .../PythonExperimentalClientCodegen.java      |   4 +-
 .../python-experimental/README.handlebars     |  12 +-
 .../__init__test_paths.handlebars             |   4 +-
 .../python-experimental/api_client.handlebars |  11 +-
 .../apis_path_to_api.handlebars               |   4 +-
 .../apis_tag_to_api.handlebars                |   4 +-
 .../python-experimental/endpoint.handlebars   |  19 +--
 .../composed_schemas.handlebars               |  14 +-
 .../model_templates/dict_partial.handlebars   |  15 +-
 .../model_templates/enums.handlebars          |   6 +-
 .../imports_schema_types.handlebars           |   1 +
 .../model_templates/list_partial.handlebars   |   5 +-
 ...property_getitems_with_addprops.handlebars |  28 ++--
 ..._getitems_with_addprops_getitem.handlebars |   2 +-
 ...perty_getitems_without_addprops.handlebars |  16 +--
 .../python-experimental/schemas.handlebars    | 134 +++++++++---------
 .../python-experimental/setup.handlebars      |   1 +
 .../python-experimental/tox.handlebars        |   3 +-
 .../python-experimental/README.md             |  14 +-
 .../python-experimental/setup.py              |   3 +-
 .../test/test_paths/__init__.py               |   4 +-
 .../python-experimental/tox.ini               |   3 +-
 .../unit_test_api/api_client.py               |  11 +-
 .../unit_test_api/apis/path_to_api.py         |   4 +-
 .../unit_test_api/apis/tag_to_api.py          |   4 +-
 ...s_allows_a_schema_which_should_validate.py |  13 +-
 ..._allows_a_schema_which_should_validate.pyi |  13 +-
 ...tionalproperties_are_allowed_by_default.py |  13 +-
 ...ionalproperties_are_allowed_by_default.pyi |  13 +-
 ...dditionalproperties_can_exist_by_itself.py |   1 +
 ...ditionalproperties_can_exist_by_itself.pyi |   1 +
 ...operties_should_not_look_in_applicators.py |  12 +-
 ...perties_should_not_look_in_applicators.pyi |  12 +-
 .../unit_test_api/model/allof.py              |  20 +--
 .../unit_test_api/model/allof.pyi             |  20 +--
 .../model/allof_combined_with_anyof_oneof.py  |  10 +-
 .../model/allof_combined_with_anyof_oneof.pyi |  10 +-
 .../unit_test_api/model/allof_simple_types.py |   4 +-
 .../model/allof_simple_types.pyi              |   4 +-
 .../model/allof_with_base_schema.py           |  28 ++--
 .../model/allof_with_base_schema.pyi          |  28 ++--
 .../model/allof_with_one_empty_schema.py      |   4 +-
 .../model/allof_with_one_empty_schema.pyi     |   4 +-
 .../allof_with_the_first_empty_schema.py      |   4 +-
 .../allof_with_the_first_empty_schema.pyi     |   4 +-
 .../model/allof_with_the_last_empty_schema.py |   4 +-
 .../allof_with_the_last_empty_schema.pyi      |   4 +-
 .../model/allof_with_two_empty_schemas.py     |   4 +-
 .../model/allof_with_two_empty_schemas.pyi    |   4 +-
 .../unit_test_api/model/anyof.py              |   4 +-
 .../unit_test_api/model/anyof.pyi             |   4 +-
 .../model/anyof_complex_types.py              |  20 +--
 .../model/anyof_complex_types.pyi             |  20 +--
 .../model/anyof_with_base_schema.py           |   4 +-
 .../model/anyof_with_base_schema.pyi          |   4 +-
 .../model/anyof_with_one_empty_schema.py      |   4 +-
 .../model/anyof_with_one_empty_schema.pyi     |   4 +-
 .../model/array_type_matches_arrays.py        |   1 +
 .../model/array_type_matches_arrays.pyi       |   1 +
 .../model/boolean_type_matches_booleans.py    |   1 +
 .../model/boolean_type_matches_booleans.pyi   |   1 +
 .../unit_test_api/model/by_int.py             |   1 +
 .../unit_test_api/model/by_int.pyi            |   1 +
 .../unit_test_api/model/by_number.py          |   1 +
 .../unit_test_api/model/by_number.pyi         |   1 +
 .../unit_test_api/model/by_small_number.py    |   1 +
 .../unit_test_api/model/by_small_number.pyi   |   1 +
 .../unit_test_api/model/date_time_format.py   |   1 +
 .../unit_test_api/model/date_time_format.pyi  |   1 +
 .../unit_test_api/model/email_format.py       |   1 +
 .../unit_test_api/model/email_format.pyi      |   1 +
 .../model/enum_with0_does_not_match_false.py  |   4 +-
 .../model/enum_with0_does_not_match_false.pyi |   4 +-
 .../model/enum_with1_does_not_match_true.py   |   4 +-
 .../model/enum_with1_does_not_match_true.pyi  |   4 +-
 .../model/enum_with_escaped_characters.py     |   7 +-
 .../model/enum_with_escaped_characters.pyi    |   7 +-
 .../model/enum_with_false_does_not_match0.py  |   4 +-
 .../model/enum_with_false_does_not_match0.pyi |   4 +-
 .../model/enum_with_true_does_not_match1.py   |   4 +-
 .../model/enum_with_true_does_not_match1.pyi  |   4 +-
 .../model/enums_in_properties.py              |  19 ++-
 .../model/enums_in_properties.pyi             |  19 ++-
 .../unit_test_api/model/forbidden_property.py |   9 +-
 .../model/forbidden_property.pyi              |   9 +-
 .../unit_test_api/model/hostname_format.py    |   1 +
 .../unit_test_api/model/hostname_format.pyi   |   1 +
 .../model/integer_type_matches_integers.py    |   1 +
 .../model/integer_type_matches_integers.pyi   |   1 +
 ...not_raise_error_when_float_division_inf.py |   1 +
 ...ot_raise_error_when_float_division_inf.pyi |   1 +
 .../model/invalid_string_value_for_default.py |   9 +-
 .../invalid_string_value_for_default.pyi      |   9 +-
 .../unit_test_api/model/ipv4_format.py        |   1 +
 .../unit_test_api/model/ipv4_format.pyi       |   1 +
 .../unit_test_api/model/ipv6_format.py        |   1 +
 .../unit_test_api/model/ipv6_format.pyi       |   1 +
 .../model/json_pointer_format.py              |   1 +
 .../model/json_pointer_format.pyi             |   1 +
 .../unit_test_api/model/maximum_validation.py |   1 +
 .../model/maximum_validation.pyi              |   1 +
 ...aximum_validation_with_unsigned_integer.py |   1 +
 ...ximum_validation_with_unsigned_integer.pyi |   1 +
 .../model/maxitems_validation.py              |   1 +
 .../model/maxitems_validation.pyi             |   1 +
 .../model/maxlength_validation.py             |   1 +
 .../model/maxlength_validation.pyi            |   1 +
 ...axproperties0_means_the_object_is_empty.py |   1 +
 ...xproperties0_means_the_object_is_empty.pyi |   1 +
 .../model/maxproperties_validation.py         |   1 +
 .../model/maxproperties_validation.pyi        |   1 +
 .../unit_test_api/model/minimum_validation.py |   1 +
 .../model/minimum_validation.pyi              |   1 +
 .../minimum_validation_with_signed_integer.py |   1 +
 ...minimum_validation_with_signed_integer.pyi |   1 +
 .../model/minitems_validation.py              |   1 +
 .../model/minitems_validation.pyi             |   1 +
 .../model/minlength_validation.py             |   1 +
 .../model/minlength_validation.pyi            |   1 +
 .../model/minproperties_validation.py         |   1 +
 .../model/minproperties_validation.pyi        |   1 +
 .../unit_test_api/model/model_not.py          |   1 +
 .../unit_test_api/model/model_not.pyi         |   1 +
 ...ted_allof_to_check_validation_semantics.py |   7 +-
 ...ed_allof_to_check_validation_semantics.pyi |   7 +-
 ...ted_anyof_to_check_validation_semantics.py |   7 +-
 ...ed_anyof_to_check_validation_semantics.pyi |   7 +-
 .../unit_test_api/model/nested_items.py       |   1 +
 .../unit_test_api/model/nested_items.pyi      |   1 +
 ...ted_oneof_to_check_validation_semantics.py |   7 +-
 ...ed_oneof_to_check_validation_semantics.pyi |   7 +-
 .../model/not_more_complex_schema.py          |   9 +-
 .../model/not_more_complex_schema.pyi         |   9 +-
 .../model/nul_characters_in_strings.py        |   4 +-
 .../model/nul_characters_in_strings.pyi       |   4 +-
 .../null_type_matches_only_the_null_object.py |   1 +
 ...null_type_matches_only_the_null_object.pyi |   1 +
 .../model/number_type_matches_numbers.py      |   1 +
 .../model/number_type_matches_numbers.pyi     |   1 +
 .../model/object_properties_validation.py     |  13 +-
 .../model/object_properties_validation.pyi    |  13 +-
 .../unit_test_api/model/oneof.py              |   4 +-
 .../unit_test_api/model/oneof.pyi             |   4 +-
 .../model/oneof_complex_types.py              |  20 +--
 .../model/oneof_complex_types.pyi             |  20 +--
 .../model/oneof_with_base_schema.py           |   4 +-
 .../model/oneof_with_base_schema.pyi          |   4 +-
 .../model/oneof_with_empty_schema.py          |   4 +-
 .../model/oneof_with_empty_schema.pyi         |   4 +-
 .../model/oneof_with_required.py              |   4 +-
 .../model/oneof_with_required.pyi             |   4 +-
 .../model/pattern_is_not_anchored.py          |   1 +
 .../model/pattern_is_not_anchored.pyi         |   1 +
 .../unit_test_api/model/pattern_validation.py |   1 +
 .../model/pattern_validation.pyi              |   1 +
 .../properties_with_escaped_characters.py     |  29 ++--
 .../properties_with_escaped_characters.pyi    |  29 ++--
 ...perty_named_ref_that_is_not_a_reference.py |   9 +-
 ...erty_named_ref_that_is_not_a_reference.pyi |   9 +-
 .../model/ref_in_additionalproperties.py      |   6 +-
 .../model/ref_in_additionalproperties.pyi     |   6 +-
 .../unit_test_api/model/ref_in_allof.py       |   4 +-
 .../unit_test_api/model/ref_in_allof.pyi      |   4 +-
 .../unit_test_api/model/ref_in_anyof.py       |   4 +-
 .../unit_test_api/model/ref_in_anyof.pyi      |   4 +-
 .../unit_test_api/model/ref_in_items.py       |   6 +-
 .../unit_test_api/model/ref_in_items.pyi      |   6 +-
 .../unit_test_api/model/ref_in_not.py         |   6 +-
 .../unit_test_api/model/ref_in_not.pyi        |   6 +-
 .../unit_test_api/model/ref_in_oneof.py       |   4 +-
 .../unit_test_api/model/ref_in_oneof.pyi      |   4 +-
 .../unit_test_api/model/ref_in_property.py    |  14 +-
 .../unit_test_api/model/ref_in_property.pyi   |  14 +-
 .../model/required_default_validation.py      |   9 +-
 .../model/required_default_validation.pyi     |   9 +-
 .../model/required_validation.py              |  13 +-
 .../model/required_validation.pyi             |  13 +-
 .../model/required_with_empty_array.py        |   9 +-
 .../model/required_with_empty_array.pyi       |   9 +-
 .../model/required_with_escaped_characters.py |   1 +
 .../required_with_escaped_characters.pyi      |   1 +
 .../model/simple_enum_validation.py           |  10 +-
 .../model/simple_enum_validation.pyi          |  10 +-
 .../model/string_type_matches_strings.py      |   1 +
 .../model/string_type_matches_strings.pyi     |   1 +
 ..._do_anything_if_the_property_is_missing.py |   9 +-
 ...do_anything_if_the_property_is_missing.pyi |   9 +-
 .../model/uniqueitems_false_validation.py     |   1 +
 .../model/uniqueitems_false_validation.pyi    |   1 +
 .../model/uniqueitems_validation.py           |   1 +
 .../model/uniqueitems_validation.pyi          |   1 +
 .../unit_test_api/model/uri_format.py         |   1 +
 .../unit_test_api/model/uri_format.pyi        |   1 +
 .../model/uri_reference_format.py             |   1 +
 .../model/uri_reference_format.pyi            |   1 +
 .../model/uri_template_format.py              |   1 +
 .../model/uri_template_format.pyi             |   1 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |  10 +-
 .../post.pyi                                  |  10 +-
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   7 +-
 .../post.pyi                                  |   7 +-
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |  10 +-
 .../post.pyi                                  |  10 +-
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   7 +-
 .../post.pyi                                  |   7 +-
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../unit_test_api/schemas.py                  | 134 +++++++++---------
 .../petstore/python-experimental/README.md    |  14 +-
 .../petstore_api/api_client.py                |  11 +-
 .../petstore_api/apis/path_to_api.py          |   4 +-
 .../petstore_api/apis/paths/fake_1.py         |  13 --
 .../petstore_api/apis/paths/fake_2.py         |  13 --
 .../petstore_api/apis/paths/fake_3.py         |  13 --
 .../petstore_api/apis/paths/pet_2.py          |   9 --
 .../petstore_api/apis/paths/pet_pet_id_1.py   |  11 --
 .../petstore_api/apis/paths/pet_pet_id_3.py   |  11 --
 .../apis/paths/store_order_order_id_1.py      |   9 --
 .../apis/paths/user_username_1.py             |  11 --
 .../apis/paths/user_username_2.py             |  11 --
 .../petstore_api/apis/tag_to_api.py           |   4 +-
 .../petstore_api/apis/tags/fake_api.py        |   6 +-
 .../petstore_api/apis/tags/pet_api.py         |   6 +-
 .../petstore_api/apis/tags/store_api.py       |   2 +-
 .../petstore_api/apis/tags/user_api.py        |   4 +-
 .../model/additional_properties_class.py      |  37 ++---
 .../model/additional_properties_class.pyi     |  37 ++---
 .../model/additional_properties_validator.py  |   4 +-
 .../model/additional_properties_validator.pyi |   4 +-
 ...ditional_properties_with_array_of_enums.py |   6 +-
 ...itional_properties_with_array_of_enums.pyi |   6 +-
 .../petstore_api/model/address.py             |   1 +
 .../petstore_api/model/address.pyi            |   1 +
 .../petstore_api/model/animal.py              |  18 +--
 .../petstore_api/model/animal.pyi             |  18 +--
 .../petstore_api/model/animal_farm.py         |   6 +-
 .../petstore_api/model/animal_farm.pyi        |   6 +-
 .../petstore_api/model/any_type_and_format.py |  41 +++---
 .../model/any_type_and_format.pyi             |  41 +++---
 .../petstore_api/model/any_type_not_string.py |   1 +
 .../model/any_type_not_string.pyi             |   1 +
 .../petstore_api/model/api_response.py        |  17 +--
 .../petstore_api/model/api_response.pyi       |  17 +--
 .../petstore_api/model/apple.py               |  13 +-
 .../petstore_api/model/apple.pyi              |  13 +-
 .../petstore_api/model/apple_req.py           |  13 +-
 .../petstore_api/model/apple_req.pyi          |  13 +-
 .../model/array_holding_any_type.py           |   1 +
 .../model/array_holding_any_type.pyi          |   1 +
 .../model/array_of_array_of_number_only.py    |   9 +-
 .../model/array_of_array_of_number_only.pyi   |   9 +-
 .../petstore_api/model/array_of_enums.py      |   6 +-
 .../petstore_api/model/array_of_enums.pyi     |   6 +-
 .../model/array_of_number_only.py             |   9 +-
 .../model/array_of_number_only.pyi            |   9 +-
 .../petstore_api/model/array_test.py          |  22 +--
 .../petstore_api/model/array_test.pyi         |  22 +--
 .../model/array_with_validations_in_items.py  |   1 +
 .../model/array_with_validations_in_items.pyi |   1 +
 .../petstore_api/model/banana.py              |   9 +-
 .../petstore_api/model/banana.pyi             |   9 +-
 .../petstore_api/model/banana_req.py          |  13 +-
 .../petstore_api/model/banana_req.pyi         |  13 +-
 .../petstore_api/model/bar.py                 |   1 +
 .../petstore_api/model/bar.pyi                |   1 +
 .../petstore_api/model/basque_pig.py          |  12 +-
 .../petstore_api/model/basque_pig.pyi         |  12 +-
 .../petstore_api/model/boolean.py             |   1 +
 .../petstore_api/model/boolean.pyi            |   1 +
 .../petstore_api/model/boolean_enum.py        |   4 +-
 .../petstore_api/model/boolean_enum.pyi       |   4 +-
 .../petstore_api/model/capitalization.py      |  29 ++--
 .../petstore_api/model/capitalization.pyi     |  29 ++--
 .../petstore_api/model/cat.py                 |  12 +-
 .../petstore_api/model/cat.pyi                |  12 +-
 .../petstore_api/model/category.py            |  13 +-
 .../petstore_api/model/category.pyi           |  13 +-
 .../petstore_api/model/child_cat.py           |  12 +-
 .../petstore_api/model/child_cat.pyi          |  12 +-
 .../petstore_api/model/class_model.py         |   9 +-
 .../petstore_api/model/class_model.pyi        |   9 +-
 .../petstore_api/model/client.py              |   9 +-
 .../petstore_api/model/client.pyi             |   9 +-
 .../model/complex_quadrilateral.py            |  15 +-
 .../model/complex_quadrilateral.pyi           |  15 +-
 ...d_any_of_different_types_no_validations.py |   4 +-
 ..._any_of_different_types_no_validations.pyi |   4 +-
 .../petstore_api/model/composed_array.py      |   1 +
 .../petstore_api/model/composed_array.pyi     |   1 +
 .../petstore_api/model/composed_bool.py       |   4 +-
 .../petstore_api/model/composed_bool.pyi      |   4 +-
 .../petstore_api/model/composed_none.py       |   4 +-
 .../petstore_api/model/composed_none.pyi      |   4 +-
 .../petstore_api/model/composed_number.py     |   4 +-
 .../petstore_api/model/composed_number.pyi    |   4 +-
 .../petstore_api/model/composed_object.py     |   4 +-
 .../petstore_api/model/composed_object.pyi    |   4 +-
 .../model/composed_one_of_different_types.py  |   4 +-
 .../model/composed_one_of_different_types.pyi |   4 +-
 .../petstore_api/model/composed_string.py     |   4 +-
 .../petstore_api/model/composed_string.pyi    |   4 +-
 .../petstore_api/model/currency.py            |   7 +-
 .../petstore_api/model/currency.pyi           |   7 +-
 .../petstore_api/model/danish_pig.py          |  12 +-
 .../petstore_api/model/danish_pig.pyi         |  12 +-
 .../petstore_api/model/date_time_test.py      |   1 +
 .../petstore_api/model/date_time_test.pyi     |   1 +
 .../model/date_time_with_validations.py       |   1 +
 .../model/date_time_with_validations.pyi      |   1 +
 .../model/date_with_validations.py            |   1 +
 .../model/date_with_validations.pyi           |   1 +
 .../petstore_api/model/decimal_payload.py     |   1 +
 .../petstore_api/model/decimal_payload.pyi    |   1 +
 .../petstore_api/model/dog.py                 |  12 +-
 .../petstore_api/model/dog.pyi                |  12 +-
 .../petstore_api/model/drawing.py             |  46 +++---
 .../petstore_api/model/drawing.pyi            |  46 +++---
 .../petstore_api/model/enum_arrays.py         |  25 ++--
 .../petstore_api/model/enum_arrays.pyi        |  25 ++--
 .../petstore_api/model/enum_class.py          |  16 +--
 .../petstore_api/model/enum_class.pyi         |  16 +--
 .../petstore_api/model/enum_test.py           |  96 ++++++-------
 .../petstore_api/model/enum_test.pyi          |  96 ++++++-------
 .../model/equilateral_triangle.py             |  15 +-
 .../model/equilateral_triangle.pyi            |  15 +-
 .../petstore_api/model/file.py                |   9 +-
 .../petstore_api/model/file.pyi               |   9 +-
 .../model/file_schema_test_class.py           |  23 ++-
 .../model/file_schema_test_class.pyi          |  23 ++-
 .../petstore_api/model/foo.py                 |   9 +-
 .../petstore_api/model/foo.pyi                |   9 +-
 .../petstore_api/model/format_test.py         |  89 ++++++------
 .../petstore_api/model/format_test.pyi        |  89 ++++++------
 .../petstore_api/model/fruit.py               |  12 +-
 .../petstore_api/model/fruit.pyi              |  12 +-
 .../petstore_api/model/fruit_req.py           |   4 +-
 .../petstore_api/model/fruit_req.pyi          |   4 +-
 .../petstore_api/model/gm_fruit.py            |  12 +-
 .../petstore_api/model/gm_fruit.pyi           |  12 +-
 .../petstore_api/model/grandparent_animal.py  |  14 +-
 .../petstore_api/model/grandparent_animal.pyi |  14 +-
 .../petstore_api/model/has_only_read_only.py  |  13 +-
 .../petstore_api/model/has_only_read_only.pyi |  13 +-
 .../petstore_api/model/health_check_result.py |   9 +-
 .../model/health_check_result.pyi             |   9 +-
 .../petstore_api/model/integer_enum.py        |  10 +-
 .../petstore_api/model/integer_enum.pyi       |  10 +-
 .../petstore_api/model/integer_enum_big.py    |  10 +-
 .../petstore_api/model/integer_enum_big.pyi   |  10 +-
 .../model/integer_enum_one_value.py           |   4 +-
 .../model/integer_enum_one_value.pyi          |   4 +-
 .../model/integer_enum_with_default_value.py  |  10 +-
 .../model/integer_enum_with_default_value.pyi |  10 +-
 .../petstore_api/model/integer_max10.py       |   1 +
 .../petstore_api/model/integer_max10.pyi      |   1 +
 .../petstore_api/model/integer_min15.py       |   1 +
 .../petstore_api/model/integer_min15.pyi      |   1 +
 .../petstore_api/model/isosceles_triangle.py  |  15 +-
 .../petstore_api/model/isosceles_triangle.pyi |  15 +-
 .../petstore_api/model/json_patch_request.py  |   4 +-
 .../petstore_api/model/json_patch_request.pyi |   4 +-
 .../json_patch_request_add_replace_test.py    |  26 ++--
 .../json_patch_request_add_replace_test.pyi   |  26 ++--
 .../model/json_patch_request_move_copy.py     |  23 ++-
 .../model/json_patch_request_move_copy.pyi    |  23 ++-
 .../model/json_patch_request_remove.py        |  16 +--
 .../model/json_patch_request_remove.pyi       |  16 +--
 .../petstore_api/model/mammal.py              |   9 +-
 .../petstore_api/model/mammal.pyi             |   9 +-
 .../petstore_api/model/map_test.py            |  32 ++---
 .../petstore_api/model/map_test.pyi           |  32 ++---
 ...perties_and_additional_properties_class.py |  22 +--
 ...erties_and_additional_properties_class.pyi |  22 +--
 .../petstore_api/model/model200_response.py   |  13 +-
 .../petstore_api/model/model200_response.pyi  |  13 +-
 .../petstore_api/model/model_return.py        |   9 +-
 .../petstore_api/model/model_return.pyi       |   9 +-
 .../petstore_api/model/money.py               |  18 +--
 .../petstore_api/model/money.pyi              |  18 +--
 .../petstore_api/model/name.py                |  17 +--
 .../petstore_api/model/name.pyi               |  17 +--
 .../model/no_additional_properties.py         |  13 +-
 .../model/no_additional_properties.pyi        |  13 +-
 .../petstore_api/model/nullable_class.py      |  53 +++----
 .../petstore_api/model/nullable_class.pyi     |  53 +++----
 .../petstore_api/model/nullable_shape.py      |   4 +-
 .../petstore_api/model/nullable_shape.pyi     |   4 +-
 .../petstore_api/model/nullable_string.py     |   1 +
 .../petstore_api/model/nullable_string.pyi    |   1 +
 .../petstore_api/model/number.py              |   1 +
 .../petstore_api/model/number.pyi             |   1 +
 .../petstore_api/model/number_only.py         |   9 +-
 .../petstore_api/model/number_only.pyi        |   9 +-
 .../model/number_with_validations.py          |   1 +
 .../model/number_with_validations.pyi         |   1 +
 .../petstore_api/model/object_interface.py    |   1 +
 .../petstore_api/model/object_interface.pyi   |   1 +
 .../model/object_model_with_ref_props.py      |  22 +--
 .../model/object_model_with_ref_props.pyi     |  22 +--
 .../model/object_with_decimal_properties.py   |  22 +--
 .../model/object_with_decimal_properties.pyi  |  22 +--
 .../object_with_difficultly_named_props.py    |  17 +--
 .../object_with_difficultly_named_props.pyi   |  17 +--
 ...object_with_inline_composition_property.py |  12 +-
 ...bject_with_inline_composition_property.pyi |  12 +-
 .../model/object_with_validations.py          |   1 +
 .../model/object_with_validations.pyi         |   1 +
 .../petstore_api/model/order.py               |  38 +++--
 .../petstore_api/model/order.pyi              |  38 +++--
 .../petstore_api/model/parent_pet.py          |   9 +-
 .../petstore_api/model/parent_pet.pyi         |   9 +-
 .../petstore_api/model/pet.py                 |  48 +++----
 .../petstore_api/model/pet.pyi                |  48 +++----
 .../petstore_api/model/pig.py                 |   9 +-
 .../petstore_api/model/pig.pyi                |   9 +-
 .../petstore_api/model/player.py              |  18 +--
 .../petstore_api/model/player.pyi             |  18 +--
 .../petstore_api/model/quadrilateral.py       |   9 +-
 .../petstore_api/model/quadrilateral.pyi      |   9 +-
 .../model/quadrilateral_interface.py          |  16 +--
 .../model/quadrilateral_interface.pyi         |  16 +--
 .../petstore_api/model/read_only_first.py     |  13 +-
 .../petstore_api/model/read_only_first.pyi    |  13 +-
 .../petstore_api/model/scalene_triangle.py    |  15 +-
 .../petstore_api/model/scalene_triangle.pyi   |  15 +-
 .../petstore_api/model/shape.py               |   9 +-
 .../petstore_api/model/shape.pyi              |   9 +-
 .../petstore_api/model/shape_or_null.py       |   9 +-
 .../petstore_api/model/shape_or_null.pyi      |   9 +-
 .../model/simple_quadrilateral.py             |  15 +-
 .../model/simple_quadrilateral.pyi            |  15 +-
 .../petstore_api/model/some_object.py         |   4 +-
 .../petstore_api/model/some_object.pyi        |   4 +-
 .../petstore_api/model/special_model_name.py  |   9 +-
 .../petstore_api/model/special_model_name.pyi |   9 +-
 .../petstore_api/model/string.py              |   1 +
 .../petstore_api/model/string.pyi             |   1 +
 .../petstore_api/model/string_boolean_map.py  |   1 +
 .../petstore_api/model/string_boolean_map.pyi |   1 +
 .../petstore_api/model/string_enum.py         |  22 ++-
 .../petstore_api/model/string_enum.pyi        |  22 ++-
 .../model/string_enum_with_default_value.py   |  10 +-
 .../model/string_enum_with_default_value.pyi  |  10 +-
 .../model/string_with_validation.py           |   1 +
 .../model/string_with_validation.pyi          |   1 +
 .../petstore_api/model/tag.py                 |  13 +-
 .../petstore_api/model/tag.pyi                |  13 +-
 .../petstore_api/model/triangle.py            |   9 +-
 .../petstore_api/model/triangle.pyi           |   9 +-
 .../petstore_api/model/triangle_interface.py  |  16 +--
 .../petstore_api/model/triangle_interface.pyi |  16 +--
 .../petstore_api/model/user.py                |  57 ++++----
 .../petstore_api/model/user.pyi               |  57 ++++----
 .../petstore_api/model/uuid_string.py         |   1 +
 .../petstore_api/model/uuid_string.pyi        |   1 +
 .../petstore_api/model/whale.py               |  20 +--
 .../petstore_api/model/whale.pyi              |  20 +--
 .../petstore_api/model/zebra.py               |  25 ++--
 .../petstore_api/model/zebra.pyi              |  25 ++--
 .../paths/another_fake_dummy/patch.py         |   2 +
 .../paths/another_fake_dummy/patch.pyi        |   2 +
 .../paths/{fake_3 => fake}/delete.py          |  10 +-
 .../paths/{fake_3 => fake}/delete.pyi         |   2 +
 .../paths/{fake_2 => fake}/get.py             |  79 ++++-------
 .../paths/{fake_2 => fake}/get.pyi            |  71 ++++------
 .../petstore_api/paths/fake/patch.py          |   2 +
 .../petstore_api/paths/fake/patch.pyi         |   2 +
 .../paths/{fake_1 => fake}/post.py            |  62 ++++----
 .../paths/{fake_1 => fake}/post.pyi           |  62 ++++----
 .../petstore_api/paths/fake_1/__init__.py     |   7 -
 .../petstore_api/paths/fake_2/__init__.py     |   7 -
 .../petstore_api/paths/fake_3/__init__.py     |   7 -
 .../get.py                                    |   2 +
 .../get.pyi                                   |   2 +
 .../paths/fake_body_with_file_schema/put.py   |   2 +
 .../paths/fake_body_with_file_schema/put.pyi  |   2 +
 .../paths/fake_body_with_query_params/put.py  |   6 +-
 .../paths/fake_body_with_query_params/put.pyi |   2 +
 .../paths/fake_case_sensitive_params/put.py   |   6 +-
 .../paths/fake_case_sensitive_params/put.pyi  |   2 +
 .../paths/fake_classname_test/patch.py        |   2 +
 .../paths/fake_classname_test/patch.pyi       |   2 +
 .../paths/fake_delete_coffee_id/delete.py     |   6 +-
 .../paths/fake_delete_coffee_id/delete.pyi    |   2 +
 .../petstore_api/paths/fake_health/get.py     |   2 +
 .../petstore_api/paths/fake_health/get.pyi    |   2 +
 .../fake_inline_additional_properties/post.py |   2 +
 .../post.pyi                                  |   2 +
 .../paths/fake_inline_composition_/post.py    |  48 +++----
 .../paths/fake_inline_composition_/post.pyi   |  44 +++---
 .../paths/fake_json_form_data/get.py          |  14 +-
 .../paths/fake_json_form_data/get.pyi         |  14 +-
 .../paths/fake_json_patch/patch.py            |   2 +
 .../paths/fake_json_patch/patch.pyi           |   2 +
 .../paths/fake_json_with_charset/post.py      |   2 +
 .../paths/fake_json_with_charset/post.pyi     |   2 +
 .../paths/fake_obj_in_query/get.py            |  14 +-
 .../paths/fake_obj_in_query/get.pyi           |  10 +-
 .../post.py                                   |  18 +--
 .../post.pyi                                  |   2 +
 .../post.py                                   |  18 +--
 .../post.pyi                                  |  14 +-
 .../paths/fake_ref_obj_in_query/get.py        |   6 +-
 .../paths/fake_ref_obj_in_query/get.pyi       |   2 +
 .../paths/fake_refs_array_of_enums/post.py    |   2 +
 .../paths/fake_refs_array_of_enums/post.pyi   |   2 +
 .../paths/fake_refs_arraymodel/post.py        |   2 +
 .../paths/fake_refs_arraymodel/post.pyi       |   2 +
 .../paths/fake_refs_boolean/post.py           |   2 +
 .../paths/fake_refs_boolean/post.pyi          |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../petstore_api/paths/fake_refs_enum/post.py |   2 +
 .../paths/fake_refs_enum/post.pyi             |   2 +
 .../paths/fake_refs_mammal/post.py            |   2 +
 .../paths/fake_refs_mammal/post.pyi           |   2 +
 .../paths/fake_refs_number/post.py            |   2 +
 .../paths/fake_refs_number/post.pyi           |   2 +
 .../post.py                                   |   2 +
 .../post.pyi                                  |   2 +
 .../paths/fake_refs_string/post.py            |   2 +
 .../paths/fake_refs_string/post.pyi           |   2 +
 .../paths/fake_response_without_schema/get.py |   2 +
 .../fake_response_without_schema/get.pyi      |   2 +
 .../paths/fake_test_query_paramters/put.py    |   6 +-
 .../paths/fake_test_query_paramters/put.pyi   |   2 +
 .../paths/fake_upload_download_file/post.py   |   2 +
 .../paths/fake_upload_download_file/post.pyi  |   2 +
 .../paths/fake_upload_file/post.py            |  14 +-
 .../paths/fake_upload_file/post.pyi           |  14 +-
 .../paths/fake_upload_files/post.py           |  10 +-
 .../paths/fake_upload_files/post.pyi          |  10 +-
 .../petstore_api/paths/foo/get.py             |  15 +-
 .../petstore_api/paths/foo/get.pyi            |  15 +-
 .../petstore_api/paths/pet/post.py            |   2 +
 .../petstore_api/paths/pet/post.pyi           |   2 +
 .../petstore_api/paths/{pet_2 => pet}/put.py  |   2 +
 .../petstore_api/paths/{pet_2 => pet}/put.pyi |   2 +
 .../petstore_api/paths/pet_2/__init__.py      |   7 -
 .../paths/pet_find_by_status/get.py           |  25 ++--
 .../paths/pet_find_by_status/get.pyi          |  21 ++-
 .../paths/pet_find_by_tags/get.py             |  16 +--
 .../paths/pet_find_by_tags/get.pyi            |  12 +-
 .../petstore_api/paths/pet_pet_id/delete.py   |  10 +-
 .../petstore_api/paths/pet_pet_id/delete.pyi  |   2 +
 .../paths/{pet_pet_id_1 => pet_pet_id}/get.py |   6 +-
 .../{pet_pet_id_1 => pet_pet_id}/get.pyi      |   2 +
 .../{pet_pet_id_3 => pet_pet_id}/post.py      |  18 +--
 .../{pet_pet_id_3 => pet_pet_id}/post.pyi     |  14 +-
 .../paths/pet_pet_id_1/__init__.py            |   7 -
 .../paths/pet_pet_id_3/__init__.py            |   7 -
 .../paths/pet_pet_id_upload_image/post.py     |  18 +--
 .../paths/pet_pet_id_upload_image/post.pyi    |  14 +-
 .../petstore_api/paths/store_inventory/get.py |   2 +
 .../paths/store_inventory/get.pyi             |   2 +
 .../petstore_api/paths/store_order/post.py    |   2 +
 .../petstore_api/paths/store_order/post.pyi   |   2 +
 .../paths/store_order_order_id/delete.py      |   6 +-
 .../paths/store_order_order_id/delete.pyi     |   2 +
 .../get.py                                    |   6 +-
 .../get.pyi                                   |   2 +
 .../paths/store_order_order_id_1/__init__.py  |   7 -
 .../petstore_api/paths/user/post.py           |   2 +
 .../petstore_api/paths/user/post.pyi          |   2 +
 .../paths/user_create_with_array/post.py      |   7 +-
 .../paths/user_create_with_array/post.pyi     |   7 +-
 .../paths/user_create_with_list/post.py       |   7 +-
 .../paths/user_create_with_list/post.pyi      |   7 +-
 .../petstore_api/paths/user_login/get.py      |   8 +-
 .../petstore_api/paths/user_login/get.pyi     |   2 +
 .../petstore_api/paths/user_logout/get.py     |   2 +
 .../petstore_api/paths/user_logout/get.pyi    |   2 +
 .../paths/user_username/delete.py             |   6 +-
 .../paths/user_username/delete.pyi            |   2 +
 .../{user_username_1 => user_username}/get.py |   6 +-
 .../get.pyi                                   |   2 +
 .../{user_username_2 => user_username}/put.py |   6 +-
 .../put.pyi                                   |   2 +
 .../paths/user_username_1/__init__.py         |   7 -
 .../paths/user_username_2/__init__.py         |   7 -
 .../petstore_api/schemas.py                   | 134 +++++++++---------
 .../petstore/python-experimental/setup.py     |   3 +-
 .../test/test_paths/__init__.py               |   4 +-
 .../{test_fake_3 => test_fake}/test_delete.py |   2 +-
 .../{test_fake_2 => test_fake}/test_get.py    |   2 +-
 .../{test_fake_1 => test_fake}/test_post.py   |   2 +-
 .../test/test_paths/test_fake_1/__init__.py   |   0
 .../test/test_paths/test_fake_2/__init__.py   |   0
 .../test/test_paths/test_fake_3/__init__.py   |   0
 .../{test_pet_2 => test_pet}/test_put.py      |   2 +-
 .../test/test_paths/test_pet_2/__init__.py    |   0
 .../test_get.py                               |   2 +-
 .../test_post.py                              |   2 +-
 .../test_paths/test_pet_pet_id_1/__init__.py  |   0
 .../test_paths/test_pet_pet_id_3/__init__.py  |   0
 .../test_get.py                               |   2 +-
 .../test_store_order_order_id_1/__init__.py   |   0
 .../test_get.py                               |   2 +-
 .../test_put.py                               |   2 +-
 .../test_user_username_1/__init__.py          |   0
 .../test_user_username_2/__init__.py          |   0
 .../tests_manual/__init__.py                  |   6 +-
 .../test_additional_properties_validator.py   |   4 +-
 .../tests_manual/test_animal.py               |   8 +-
 .../tests_manual/test_any_type_schema.py      | 108 ++++++++------
 .../tests_manual/test_combine_schemas.py      |   8 +-
 .../tests_manual/test_fruit.py                |   2 +-
 .../tests_manual/test_fruit_req.py            |   2 +-
 .../tests_manual/test_gm_fruit.py             |   2 +-
 .../test_object_model_with_ref_props.py       |   2 -
 .../tests_manual/test_validate.py             |   2 +-
 .../petstore/python-experimental/tox.ini      |   3 +-
 954 files changed, 3800 insertions(+), 3009 deletions(-)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_1.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_2.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_3.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_2.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_1.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_3.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/store_order_order_id_1.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_1.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_2.py
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{fake_3 => fake}/delete.py (96%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{fake_3 => fake}/delete.pyi (98%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{fake_2 => fake}/get.py (90%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{fake_2 => fake}/get.pyi (89%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{fake_1 => fake}/post.py (75%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{fake_1 => fake}/post.pyi (72%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{pet_2 => pet}/put.py (98%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{pet_2 => pet}/put.pyi (98%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{pet_pet_id_1 => pet_pet_id}/get.py (97%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{pet_pet_id_1 => pet_pet_id}/get.pyi (98%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{pet_pet_id_3 => pet_pet_id}/post.py (90%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{pet_pet_id_3 => pet_pet_id}/post.pyi (90%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{store_order_order_id_1 => store_order_order_id}/get.py (97%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{store_order_order_id_1 => store_order_order_id}/get.pyi (98%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{user_username_1 => user_username}/get.py (97%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{user_username_1 => user_username}/get.pyi (98%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{user_username_2 => user_username}/put.py (97%)
 rename samples/openapi3/client/petstore/python-experimental/petstore_api/paths/{user_username_2 => user_username}/put.pyi (98%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_fake_3 => test_fake}/test_delete.py (93%)
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_fake_2 => test_fake}/test_get.py (93%)
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_fake_1 => test_fake}/test_post.py (93%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_1/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_2/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_3/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_pet_2 => test_pet}/test_put.py (93%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_2/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_pet_pet_id_1 => test_pet_pet_id}/test_get.py (92%)
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_pet_pet_id_3 => test_pet_pet_id}/test_post.py (92%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_1/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_3/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_store_order_order_id_1 => test_store_order_order_id}/test_get.py (91%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id_1/__init__.py
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_user_username_1 => test_user_username}/test_get.py (92%)
 rename samples/openapi3/client/petstore/python-experimental/test/test_paths/{test_user_username_2 => test_user_username}/test_put.py (92%)
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_1/__init__.py
 delete mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_2/__init__.py

diff --git a/docs/generators/python-experimental.md b/docs/generators/python-experimental.md
index ab5862d321b..7f74f1a810a 100644
--- a/docs/generators/python-experimental.md
+++ b/docs/generators/python-experimental.md
@@ -10,7 +10,7 @@ title: Documentation for the python-experimental Generator
 | generator stability | EXPERIMENTAL | |
 | generator type | CLIENT | |
 | generator language | Python | |
-| generator language version | >=3.9 | |
+| generator language version | >=3.7 | |
 | generator default templating engine | handlebars | |
 | helpTxt | Generates a Python client library<br /><br />Features in this generator:<br />- type hints on endpoints and model creation<br />- model parameter names use the spec defined keys and cases<br />- robust composition (oneOf/anyOf/allOf/not) where payload data is stored in one instance only<br />- endpoint parameter names use the spec defined keys and cases<br />- inline schemas are supported at any location including composition<br />- multiple content types supported in request body and response bodies<br />- run time type checking<br />- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema<br />- Sending/receiving uuids as strings supported with type:string format: uuid -> UUIDSchema<br />- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br />- all instances of schemas dynamically inherit from all matching schemas so one can use isinstance to check if validation passed<br />- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br />- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor<br />    - Exceptions: int/float is stored as Decimal, When receiving data from headers it will start as str and may need to be cast for example to int | |
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
index 1890fc0d73d..2917c2ee0a9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
@@ -328,4 +328,6 @@ public interface CodegenConfig {
     List<VendorExtension> getSupportedVendorExtensions();
 
     boolean getUseInlineModelResolver();
+
+    boolean getAddSuffixToDuplicateOperationNicknames();
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 50a9485db6b..d6eef2a4222 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -297,6 +297,12 @@ public class DefaultCodegen implements CodegenConfig {
     // from deeper schema defined locations
     protected boolean addSchemaImportsFromV3SpecLocations = false;
 
+    protected boolean addSuffixToDuplicateOperationNicknames = true;
+
+    public boolean getAddSuffixToDuplicateOperationNicknames() {
+        return addSuffixToDuplicateOperationNicknames;
+    }
+
     @Override
     public List<CliOption> cliOptions() {
         return cliOptions;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
index f8dbd5361e3..853db7ffd00 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -1200,16 +1200,18 @@ public class DefaultGenerator implements Generator {
         objs.setClassname(config.toApiName(tag));
         objs.setPathPrefix(config.toApiVarName(tag));
 
-        // check for operationId uniqueness
-        Set<String> opIds = new HashSet<>();
-        int counter = 0;
-        for (CodegenOperation op : ops) {
-            String opId = op.nickname;
-            if (opIds.contains(opId)) {
-                counter++;
-                op.nickname += "_" + counter;
+        // check for nickname uniqueness
+        if (config.getAddSuffixToDuplicateOperationNicknames()) {
+            Set<String> opIds = new HashSet<>();
+            int counter = 0;
+            for (CodegenOperation op : ops) {
+                String opId = op.nickname;
+                if (opIds.contains(opId)) {
+                    counter++;
+                    op.nickname += "_" + counter;
+                }
+                opIds.add(opId);
             }
-            opIds.add(opId);
         }
         objs.setOperation(ops);
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java
index 8741096c7b1..442bb8bb466 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java
@@ -20,7 +20,6 @@ import com.github.curiousoddman.rgxgen.RgxGen;
 import com.github.curiousoddman.rgxgen.config.RgxGenOption;
 import com.github.curiousoddman.rgxgen.config.RgxGenProperties;
 import com.google.common.base.CaseFormat;
-import io.swagger.v3.oas.annotations.tags.Tags;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
@@ -112,6 +111,7 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
         addSchemaImportsFromV3SpecLocations = true;
         sortModelPropertiesByRequiredFlag = Boolean.TRUE;
         sortParamsByRequiredFlag = Boolean.TRUE;
+        addSuffixToDuplicateOperationNicknames = false;
 
         modifyFeatureSet(features -> features
                 .includeSchemaSupportFeatures(
@@ -2638,7 +2638,7 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
     }
 
     @Override
-    public String generatorLanguageVersion() { return ">=3.9"; };
+    public String generatorLanguageVersion() { return ">=3.7"; };
 
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
index 2b19aa847c6..b8819d21161 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
@@ -18,8 +18,6 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 ## Requirements.
 
 Python {{generatorLanguageVersion}}
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
 
 ## Migration from other generators like python and python-legacy
 
@@ -60,6 +58,16 @@ object schema properties as classes
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
     and additionalProperty values
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/__init__test_paths.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/__init__test_paths.handlebars
index 3d592080805..1309632d3d5 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/__init__test_paths.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/__init__test_paths.handlebars
@@ -41,7 +41,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -50,7 +50,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
index cbbc9418486..d67e7e3d575 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
@@ -13,6 +13,7 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 from urllib.parse import urlparse, quote
@@ -704,7 +705,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -716,7 +717,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -1270,7 +1271,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -1342,9 +1343,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/apis_path_to_api.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/apis_path_to_api.handlebars
index 8a1ccb210da..a52df9cf152 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/apis_path_to_api.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/apis_path_to_api.handlebars
@@ -1,11 +1,11 @@
-import typing
+import typing_extensions
 
 from {{packageName}}.paths import PathValues
 {{#each pathModuleToApiClassname}}
 from {{packageName}}.apis.paths.{{@key}} import {{this}}
 {{/each}}
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
 {{#each pathEnumToApiClassname}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/apis_tag_to_api.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/apis_tag_to_api.handlebars
index e3c8b52fd4b..dacbc478aab 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/apis_tag_to_api.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/apis_tag_to_api.handlebars
@@ -1,11 +1,11 @@
-import typing
+import typing_extensions
 
 from {{packageName}}.apis.tags import TagValues
 {{#each tagModuleNameToApiClassname}}
 from {{packageName}}.apis.tags.{{@key}} import {{this}}
 {{/each}}
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
 {{#each tagEnumToApiClassname}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/endpoint.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/endpoint.handlebars
index 5572a238a70..c7c81d8acdb 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/endpoint.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/endpoint.handlebars
@@ -3,6 +3,7 @@
 {{>partial_header}}
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 {{#with operation}}
 {{#or headerParams bodyParam produces}}
@@ -27,7 +28,7 @@ from . import path
 {{/with}}
 {{/each}}
 {{#unless isStub}}
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
 {{#each queryParams}}
@@ -37,7 +38,7 @@ RequestRequiredQueryParams = typing.TypedDict(
 {{/each}}
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
 {{#each queryParams}}
@@ -67,7 +68,7 @@ class RequestQueryParams(RequestRequiredQueryParams, RequestOptionalQueryParams)
 {{/with}}
 {{/each}}
 {{#unless isStub}}
-RequestRequiredHeaderParams = typing.TypedDict(
+RequestRequiredHeaderParams = typing_extensions.TypedDict(
     'RequestRequiredHeaderParams',
     {
 {{#each headerParams}}
@@ -77,7 +78,7 @@ RequestRequiredHeaderParams = typing.TypedDict(
 {{/each}}
     }
 )
-RequestOptionalHeaderParams = typing.TypedDict(
+RequestOptionalHeaderParams = typing_extensions.TypedDict(
     'RequestOptionalHeaderParams',
     {
 {{#each headerParams}}
@@ -107,7 +108,7 @@ class RequestHeaderParams(RequestRequiredHeaderParams, RequestOptionalHeaderPara
 {{/with}}
 {{/each}}
 {{#unless isStub}}
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
 {{#each pathParams}}
@@ -117,7 +118,7 @@ RequestRequiredPathParams = typing.TypedDict(
 {{/each}}
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
 {{#each pathParams}}
@@ -147,7 +148,7 @@ class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams):
 {{/with}}
 {{/each}}
 {{#unless isStub}}
-RequestRequiredCookieParams = typing.TypedDict(
+RequestRequiredCookieParams = typing_extensions.TypedDict(
     'RequestRequiredCookieParams',
     {
 {{#each cookieParams}}
@@ -157,7 +158,7 @@ RequestRequiredCookieParams = typing.TypedDict(
 {{/each}}
     }
 )
-RequestOptionalCookieParams = typing.TypedDict(
+RequestOptionalCookieParams = typing_extensions.TypedDict(
     'RequestOptionalCookieParams',
     {
 {{#each cookieParams}}
@@ -278,7 +279,7 @@ _servers = (
 {{/each}}
 {{#unless isStub}}
 {{#if responseHeaders}}
-ResponseHeadersFor{{code}} = typing.TypedDict(
+ResponseHeadersFor{{code}} = typing_extensions.TypedDict(
     'ResponseHeadersFor{{code}}',
     {
 {{#each responseHeaders}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/composed_schemas.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/composed_schemas.handlebars
index 4b3102090f3..0c9264e1b14 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/composed_schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/composed_schemas.handlebars
@@ -19,8 +19,7 @@
 {{#if allOf}}
 
 @classmethod
-@property
-@functools.cache
+@functools.lru_cache()
 def all_of(cls):
     # we need this here to make our import statements work
     # we must store _composed_schemas in here so the code is only run
@@ -46,8 +45,7 @@ def all_of(cls):
 {{#if oneOf}}
 
 @classmethod
-@property
-@functools.cache
+@functools.lru_cache()
 def one_of(cls):
     # we need this here to make our import statements work
     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +71,7 @@ def one_of(cls):
 {{#if anyOf}}
 
 @classmethod
-@property
-@functools.cache
+@functools.lru_cache()
 def any_of(cls):
     # we need this here to make our import statements work
     # we must store _composed_schemas in here so the code is only run
@@ -101,9 +98,8 @@ def any_of(cls):
 {{#with not}}
 {{#if complexType}}
 
-@classmethod
-@property
-def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+@staticmethod
+def {{baseName}}() -> typing.Type['{{complexType}}']:
     return {{complexType}}
 {{else}}
 {{> model_templates/schema }}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
index 18a88cbf971..e5803340e43 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
@@ -10,9 +10,8 @@ required = {
 {{#each mappedModels}}
 {{#if @first}}
 
-@classmethod
-@property
-def discriminator(cls):
+@staticmethod
+def discriminator():
     return {
         '{{{propertyBaseName}}}': {
 {{/if}}
@@ -30,9 +29,8 @@ class properties:
 {{#each vars}}
 {{#if complexType}}
 
-    @classmethod
-    @property
-    def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+    @staticmethod
+    def {{baseName}}() -> typing.Type['{{complexType}}']:
         return {{complexType}}
 {{else}}
     {{> model_templates/schema }}
@@ -51,9 +49,8 @@ class properties:
 {{#with additionalProperties}}
 {{#if complexType}}
 
-@classmethod
-@property
-def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+@staticmethod
+def {{baseName}}() -> typing.Type['{{complexType}}']:
     return {{complexType}}
 {{else}}
 {{> model_templates/schema }}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/enums.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/enums.handlebars
index 68dd1f03db0..72861be45d6 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/enums.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/enums.handlebars
@@ -1,15 +1,13 @@
 {{#if isNull}}
 
-@classmethod
-@property
+@schemas.classproperty
 def NONE(cls):
     return cls(None)
 {{/if}}
 {{#with allowableValues}}
 {{#each enumVars}}
 
-@classmethod
-@property
+@schemas.classproperty
 def {{name}}(cls):
     return cls({{{value}}})
 {{/each}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars
index b1fb9f1a486..522c8f2c93b 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/imports_schema_types.handlebars
@@ -4,6 +4,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/list_partial.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/list_partial.handlebars
index 2830d9903e0..97c4003fe9b 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/list_partial.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/list_partial.handlebars
@@ -1,9 +1,8 @@
 {{#with items}}
 {{#if complexType}}
 
-@classmethod
-@property
-def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+@staticmethod
+def {{baseName}}() -> typing.Type['{{complexType}}']:
     return {{complexType}}
 {{else}}
 {{> model_templates/schema }}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
index bb5e1b16e60..6fd1d8a3a37 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
@@ -4,15 +4,15 @@
 
 @typing.overload
 {{#if complexType}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
 {{else}}
 {{#if schemaIsFromAdditionalProperties}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
 {{else}}
 {{#if nameInSnakeCase}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
 {{else}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
 {{/if}}
 {{/if}}
 {{/if}}
@@ -25,12 +25,12 @@ def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.proper
 
 @typing.overload
 {{#if complexType}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
 {{else}}
 {{#if nameInSnakeCase}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
 {{else}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
 {{/if}}
 {{/if}}
 {{/unless}}
@@ -58,15 +58,15 @@ def __getitem__(self, name: str) -> {{#if complexType}}'{{complexType}}'{{else}}
 
 @typing.overload
 {{#if complexType}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
 {{else}}
 {{#if schemaIsFromAdditionalProperties}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
 {{else}}
 {{#if nameInSnakeCase}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
 {{else}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
 {{/if}}
 {{/if}}
 {{/if}}
@@ -79,12 +79,12 @@ def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.prop
 
 @typing.overload
 {{#if complexType}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union['{{complexType}}', schemas.Unset]: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> typing.Union['{{complexType}}', schemas.Unset]: ...
 {{else}}
 {{#if nameInSnakeCase}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{name}}, schemas.Unset]: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{name}}, schemas.Unset]: ...
 {{else}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{baseName}}, schemas.Unset]: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{baseName}}, schemas.Unset]: ...
 {{/if}}
 {{/if}}
 {{/unless}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
index 9e84366ac16..f35667373fc 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
@@ -1,4 +1,4 @@
-def {{methodName}}(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
+def {{methodName}}(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing_extensions.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing_extensions.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
 {{#eq methodName "__getitem__"}}
     # dict_instance[name] accessor
 {{/eq}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
index 62345cf233a..efb37d4ca18 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
@@ -3,12 +3,12 @@
 
 @typing.overload
 {{#if complexType}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
 {{else}}
 {{#if nameInSnakeCase}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
 {{else}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
 {{/if}}
 {{/if}}
 {{/each}}
@@ -16,7 +16,7 @@ def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.proper
 @typing.overload
 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
 
-def __getitem__(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
+def __getitem__(self, name: typing.Union[typing_extensions.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
     # dict_instance[name] accessor
     return super().__getitem__(name)
 
@@ -26,12 +26,12 @@ def __getitem__(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseNa
 
 @typing.overload
 {{#if complexType}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}'{{complexType}}'{{#unless required}}, schemas.Unset]{{/unless}}: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}'{{complexType}}'{{#unless required}}, schemas.Unset]{{/unless}}: ...
 {{else}}
 {{#if nameInSnakeCase}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{name}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{name}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
 {{else}}
-def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{baseName}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{baseName}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
 {{/if}}
 {{/if}}
 {{/each}}
@@ -39,7 +39,7 @@ def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless req
 @typing.overload
 def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
 
-def get_item_oapg(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
+def get_item_oapg(self, name: typing.Union[typing_extensions.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
     return super().get_item_oapg(name)
 
 {{/if}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
index e74015e511e..7da16df2269 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -8,6 +8,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -176,9 +177,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -187,17 +196,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -249,6 +256,16 @@ class Schema:
             return "is {0}".format(all_class_names[0])
         return "is one of [{0}]".format(", ".join(all_class_names))
 
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
     @classmethod
     def __type_error_message(
         cls, var_value=None, var_name=None, valid_classes=None, key_type=None
@@ -856,39 +873,19 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
 class EnumMakerBase:
     pass
 
 
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
+def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> 'SchemaEnumMaker':
     class SchemaEnumMaker(EnumMakerBase):
         @classmethod
-        @property
         def _enum_value_to_name(
-                cls
+            cls
         ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
             pass
             try:
-                super_enum_value_to_name = super()._enum_value_to_name
+                super_enum_value_to_name = super()._enum_value_to_name()
             except AttributeError:
                 return enum_value_to_name
             intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
@@ -905,9 +902,9 @@ def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str,
             Validates that arg is in the enum's allowed values
             """
             try:
-                cls._enum_value_to_name[arg]
+                cls._enum_value_to_name()[arg]
             except KeyError:
-                raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name))
+                raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name()))
             return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
     return SchemaEnumMaker
@@ -1034,7 +1031,7 @@ class StrBase(ValidatorBase):
 
 class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -1100,7 +1097,7 @@ DEFAULT_ISOPARSER = CustomIsoparser()
 
 class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -1131,7 +1128,7 @@ class DateBase:
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -1168,7 +1165,7 @@ class DecimalBase:
     """
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -1337,6 +1334,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -1470,7 +1468,7 @@ class Discriminable:
         """
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -1485,21 +1483,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -1598,9 +1599,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -1671,7 +1670,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -1856,7 +1855,7 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -1872,7 +1871,7 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
@@ -1907,7 +1906,7 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
                 continue
@@ -1997,8 +1996,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -2367,10 +2367,12 @@ class BinarySchema(
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
     def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
         return super().__new__(cls, arg)
@@ -2449,7 +2451,7 @@ class DictSchema(
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/setup.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/setup.handlebars
index 5633db861aa..a346b23cb61 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/setup.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/setup.handlebars
@@ -29,6 +29,7 @@ REQUIRES = [
   "pem>=19.3.0",
   "pycryptodome>=3.9.0",
 {{/if}}
+  "typing_extensions",
 ]
 
 setup(
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/tox.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/tox.handlebars
index d1b68916df4..b2544b81d41 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/tox.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/tox.handlebars
@@ -1,7 +1,8 @@
 [tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
index 68f30a42213..8d602e0e07e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
@@ -9,9 +9,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -52,6 +50,16 @@ object schema properties as classes
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
     and additionalProperty values
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/setup.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/setup.py
index bac2d323981..5f2ac30e9fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/setup.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/setup.py
@@ -25,6 +25,7 @@ REQUIRES = [
   "certifi",
   "python-dateutil",
   "frozendict >= 2.0.3",
+  "typing_extensions",
 ]
 
 setup(
@@ -35,7 +36,7 @@ setup(
     author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "openapi 3.0.3 sample spec"],
-    python_requires=">=3.9",
+    python_requires=">=3.7",
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/test/test_paths/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/test/test_paths/__init__.py
index 3d592080805..1309632d3d5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/test/test_paths/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/test/test_paths/__init__.py
@@ -41,7 +41,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -50,7 +50,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/tox.ini b/samples/openapi3/client/3_0_3_unit_test/python-experimental/tox.ini
index e4093b56ea7..6db4b8ba647 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/tox.ini
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/tox.ini
@@ -1,7 +1,8 @@
 [tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
index a66844ae6e6..e1de9fcc9c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
@@ -20,6 +20,7 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 from urllib.parse import urlparse, quote
@@ -708,7 +709,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -720,7 +721,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -1260,7 +1261,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -1332,9 +1333,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/path_to_api.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/path_to_api.py
index dd7ac51a7a9..8a75c50c3ee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/path_to_api.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/path_to_api.py
@@ -1,4 +1,4 @@
-import typing
+import typing_extensions
 
 from unit_test_api.paths import PathValues
 from unit_test_api.apis.paths.request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body import RequestBodyPostAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody
@@ -176,7 +176,7 @@ from unit_test_api.apis.paths.response_body_post_uniqueitems_validation_response
 from unit_test_api.apis.paths.request_body_post_uniqueitems_false_validation_request_body import RequestBodyPostUniqueitemsFalseValidationRequestBody
 from unit_test_api.apis.paths.response_body_post_uniqueitems_false_validation_response_body_for_content_types import ResponseBodyPostUniqueitemsFalseValidationResponseBodyForContentTypes
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.REQUEST_BODY_POST_ADDITIONALPROPERTIES_ALLOWS_ASCHEMA_WHICH_SHOULD_VALIDATE_REQUEST_BODY: RequestBodyPostAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/tag_to_api.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/tag_to_api.py
index b2e559af74b..a40db5c5f90 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/tag_to_api.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/apis/tag_to_api.py
@@ -1,4 +1,4 @@
-import typing
+import typing_extensions
 
 from unit_test_api.apis.tags import TagValues
 from unit_test_api.apis.tags.operation_request_body_api import OperationRequestBodyApi
@@ -30,7 +30,7 @@ from unit_test_api.apis.tags.required_api import RequiredApi
 from unit_test_api.apis.tags.type_api import TypeApi
 from unit_test_api.apis.tags.unique_items_api import UniqueItemsApi
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.OPERATION_REQUEST_BODY: OperationRequestBodyApi,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
index 1f8e5f7033e..66cc28eb41e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,28 +45,28 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
         additional_properties = schemas.BoolSchema
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> MetaOapg.additional_properties: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo"], typing_extensions.Literal["bar"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo"], typing_extensions.Literal["bar"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
index 1f8e5f7033e..66cc28eb41e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,28 +45,28 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
         additional_properties = schemas.BoolSchema
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> MetaOapg.additional_properties: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo"], typing_extensions.Literal["bar"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo"], typing_extensions.Literal["bar"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py
index eba73748ba2..273766346b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,29 +45,29 @@ class AdditionalpropertiesAreAllowedByDefault(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
index eba73748ba2..273766346b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,29 +45,29 @@ class AdditionalpropertiesAreAllowedByDefault(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py
index c76dafd64a9..6f57c6b4e80 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
index c76dafd64a9..6f57c6b4e80 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py
index 59ebde538ec..cabf9af560d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,23 +52,23 @@ class AdditionalpropertiesShouldNotLookInApplicators(
         
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -87,8 +88,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
index 59ebde538ec..cabf9af560d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,23 +52,23 @@ class AdditionalpropertiesShouldNotLookInApplicators(
         
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -87,8 +88,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py
index 19133caac31..2e093c6cec6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,23 +56,23 @@ class Allof(
             bar: MetaOapg.properties.bar
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -111,23 +112,23 @@ class Allof(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -147,8 +148,7 @@ class Allof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi
index 19133caac31..2e093c6cec6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,23 +56,23 @@ class Allof(
             bar: MetaOapg.properties.bar
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -111,23 +112,23 @@ class Allof(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -147,8 +148,7 @@ class Allof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py
index 3fa73776b77..e40aab43eb4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -104,8 +105,7 @@ class AllofCombinedWithAnyofOneof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -119,8 +119,7 @@ class AllofCombinedWithAnyofOneof(
             ]
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -134,8 +133,7 @@ class AllofCombinedWithAnyofOneof(
             ]
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi
index 11ad8434f32..bc7e2eaf6bc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -101,8 +102,7 @@ class AllofCombinedWithAnyofOneof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -116,8 +116,7 @@ class AllofCombinedWithAnyofOneof(
             ]
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -131,8 +130,7 @@ class AllofCombinedWithAnyofOneof(
             ]
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py
index 4afe6d9c30a..da2bd544777 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -81,8 +82,7 @@ class AllofSimpleTypes(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi
index dbeb1f89bcb..ce96198a3e6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -79,8 +80,7 @@ class AllofSimpleTypes(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py
index 72a2d25a50f..6677ca50a7c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64,23 +65,23 @@ class AllofWithBaseSchema(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -120,23 +121,23 @@ class AllofWithBaseSchema(
             baz: MetaOapg.properties.baz
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+            def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.properties.baz: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["baz", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["baz", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.properties.baz: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["baz", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["baz", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -156,8 +157,7 @@ class AllofWithBaseSchema(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -175,23 +175,23 @@ class AllofWithBaseSchema(
     bar: MetaOapg.properties.bar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi
index 72a2d25a50f..6677ca50a7c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64,23 +65,23 @@ class AllofWithBaseSchema(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -120,23 +121,23 @@ class AllofWithBaseSchema(
             baz: MetaOapg.properties.baz
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+            def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.properties.baz: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["baz", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["baz", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.properties.baz: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["baz", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["baz", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -156,8 +157,7 @@ class AllofWithBaseSchema(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -175,23 +175,23 @@ class AllofWithBaseSchema(
     bar: MetaOapg.properties.bar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py
index 395ff56e8cc..ccdf6237db3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,8 +37,7 @@ class AllofWithOneEmptySchema(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi
index 395ff56e8cc..ccdf6237db3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,8 +37,7 @@ class AllofWithOneEmptySchema(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py
index 33ad4ab2b2a..ca512486cf0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AllofWithTheFirstEmptySchema(
         all_of_1 = schemas.NumberSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi
index 33ad4ab2b2a..ca512486cf0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AllofWithTheFirstEmptySchema(
         all_of_1 = schemas.NumberSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py
index 6cae3476255..d243c83104b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AllofWithTheLastEmptySchema(
         all_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi
index 6cae3476255..d243c83104b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AllofWithTheLastEmptySchema(
         all_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py
index 1259121f5ff..0ee8f8a3243 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AllofWithTwoEmptySchemas(
         all_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi
index 1259121f5ff..0ee8f8a3243 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AllofWithTwoEmptySchemas(
         all_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py
index 3be933464ae..fe69e481437 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -59,8 +60,7 @@ class Anyof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi
index 9f0d2d01312..d2bf4a03d2e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -58,8 +59,7 @@ class Anyof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py
index 814c1b4c0dc..6e0b801eef7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,23 +56,23 @@ class AnyofComplexTypes(
             bar: MetaOapg.properties.bar
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -111,23 +112,23 @@ class AnyofComplexTypes(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -147,8 +148,7 @@ class AnyofComplexTypes(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi
index 814c1b4c0dc..6e0b801eef7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,23 +56,23 @@ class AnyofComplexTypes(
             bar: MetaOapg.properties.bar
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -111,23 +112,23 @@ class AnyofComplexTypes(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -147,8 +148,7 @@ class AnyofComplexTypes(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py
index 96e9025ca20..a310a33c9d2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -82,8 +83,7 @@ class AnyofWithBaseSchema(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi
index e18d96327d6..65862600d54 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -80,8 +81,7 @@ class AnyofWithBaseSchema(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py
index 04896077a6c..117c0374aa8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AnyofWithOneEmptySchema(
         any_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi
index 04896077a6c..117c0374aa8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class AnyofWithOneEmptySchema(
         any_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py
index bc817fe24c3..7c6cc33a3d5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.pyi
index bc817fe24c3..7c6cc33a3d5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.py
index a71206cb3e2..8e9d55f91a4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.pyi
index a71206cb3e2..8e9d55f91a4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/boolean_type_matches_booleans.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py
index 3155db2ffe2..76988d65937 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi
index 0eecf5986be..d93f787d68b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py
index 30c0e9fa3d3..184acb97b7f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi
index 334f1e65c63..1a082d5d3e1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py
index c0ca428fa49..426ee59b91e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi
index 33fcdc68401..95da8644ea6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.py
index e814a3cb20b..9fed78c4907 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.pyi
index e814a3cb20b..9fed78c4907 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/date_time_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.py
index 112b8753d32..8a3fa4bbabb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.pyi
index 112b8753d32..8a3fa4bbabb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/email_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.py
index db670070822..8a04dd018df 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWith0DoesNotMatchFalse(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.pyi
index db670070822..8a04dd018df 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with0_does_not_match_false.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWith0DoesNotMatchFalse(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.py
index fe7278667c3..078b9e19aa6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWith1DoesNotMatchTrue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.pyi
index fe7278667c3..078b9e19aa6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with1_does_not_match_true.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWith1DoesNotMatchTrue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.py
index 37c44616d91..bf03d2da8b4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,12 +38,10 @@ class EnumWithEscapedCharacters(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def FOO_BAR(cls):
         return cls("foo\nbar")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def FOO_BAR(cls):
         return cls("foo\rbar")
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.pyi
index 37c44616d91..bf03d2da8b4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_escaped_characters.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,12 +38,10 @@ class EnumWithEscapedCharacters(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def FOO_BAR(cls):
         return cls("foo\nbar")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def FOO_BAR(cls):
         return cls("foo\rbar")
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.py
index 9650778a64c..232e3dc37b8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWithFalseDoesNotMatch0(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def FALSE(cls):
         return cls(schemas.BoolClass.FALSE)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.pyi
index 9650778a64c..232e3dc37b8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_false_does_not_match0.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWithFalseDoesNotMatch0(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def FALSE(cls):
         return cls(schemas.BoolClass.FALSE)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.py
index 18e063d3b09..f2dd03ea78e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWithTrueDoesNotMatch1(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def TRUE(cls):
         return cls(schemas.BoolClass.TRUE)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.pyi
index 18e063d3b09..f2dd03ea78e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enum_with_true_does_not_match1.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class EnumWithTrueDoesNotMatch1(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def TRUE(cls):
         return cls(schemas.BoolClass.TRUE)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py
index e53d26ced7c..87c87f94b6d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class EnumsInProperties(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def BAR(cls):
                     return cls("bar")
             
@@ -64,8 +64,7 @@ class EnumsInProperties(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def FOO(cls):
                     return cls("foo")
             __annotations__ = {
@@ -76,29 +75,29 @@ class EnumsInProperties(
     bar: MetaOapg.properties.bar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi
index e53d26ced7c..87c87f94b6d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class EnumsInProperties(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def BAR(cls):
                     return cls("bar")
             
@@ -64,8 +64,7 @@ class EnumsInProperties(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def FOO(cls):
                     return cls("foo")
             __annotations__ = {
@@ -76,29 +75,29 @@ class EnumsInProperties(
     bar: MetaOapg.properties.bar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py
index 1aac18dd68b..b81f17e5b17 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class ForbiddenProperty(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi
index 1aac18dd68b..b81f17e5b17 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class ForbiddenProperty(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.py
index 1e220982137..40942f67b82 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.pyi
index 1e220982137..40942f67b82 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/hostname_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.py
index 9b118c5ae33..ccb986ac466 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.pyi
index 9b118c5ae33..ccb986ac466 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/integer_type_matches_integers.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.py
index ddce77c6122..3f5ff42395c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.pyi
index 901f7e21267..33c88d10402 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_instance_should_not_raise_error_when_float_division_inf.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py
index 9d95c7c9e19..47529863695 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -50,23 +51,23 @@ class InvalidStringValueForDefault(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi
index 26aef46d97c..7ab2145d29b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -47,23 +48,23 @@ class InvalidStringValueForDefault(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.py
index b0751f0773e..0eae025a87f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.pyi
index b0751f0773e..0eae025a87f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv4_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.py
index 179f1486c2f..23a8aa658da 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.pyi
index 179f1486c2f..23a8aa658da 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ipv6_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.py
index 5048e6976fd..ddbc5084238 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.pyi
index 5048e6976fd..ddbc5084238 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/json_pointer_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py
index 05534d2f05c..5a992b87f00 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi
index e5d25b00879..f0f3010b941 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py
index c3945df7c20..dc28bf37f35 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi
index 945b0721cc0..223cf29f836 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py
index c08e87f4026..de40bec0b0a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi
index 581f3627282..7c0a10e4fb2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py
index 4302596e65e..c34f02ea119 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi
index 8c534135300..1ed6a96b36b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py
index 563c8847ff7..24dd02220f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi
index e07b3137535..82013206b84 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py
index 12e24a587ba..2adf12f7500 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi
index 245f240292d..4252e69a43a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py
index c9fbe08be21..6409f72d484 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi
index bc7b3723a1a..a96f7db6e39 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py
index b1c0f3f835a..73e0b2613db 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi
index 62c1d5205a0..c57929021ab 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py
index 7ee44049631..2ae9925d451 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi
index 6b2dafc6b75..d84e653cfc8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py
index 1b21d9d5042..acd0d6d8929 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi
index 221d2c728ce..7e633c88ee4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py
index a951d732a81..ebc2b1db516 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi
index 04836e5e433..ea06a20b31f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py
index 9032bfcd040..317bddb0d8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi
index 9032bfcd040..317bddb0d8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py
index b680215febb..f6f8069357f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,8 +45,7 @@ class NestedAllofToCheckValidationSemantics(
                 all_of_0 = schemas.NoneSchema
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def all_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +73,7 @@ class NestedAllofToCheckValidationSemantics(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi
index b680215febb..f6f8069357f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,8 +45,7 @@ class NestedAllofToCheckValidationSemantics(
                 all_of_0 = schemas.NoneSchema
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def all_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +73,7 @@ class NestedAllofToCheckValidationSemantics(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py
index 092e76241be..65ae3adef07 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,8 +45,7 @@ class NestedAnyofToCheckValidationSemantics(
                 any_of_0 = schemas.NoneSchema
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def any_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +73,7 @@ class NestedAnyofToCheckValidationSemantics(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi
index 092e76241be..65ae3adef07 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,8 +45,7 @@ class NestedAnyofToCheckValidationSemantics(
                 any_of_0 = schemas.NoneSchema
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def any_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +73,7 @@ class NestedAnyofToCheckValidationSemantics(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py
index efd3e685b50..36f1aad97fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.pyi
index efd3e685b50..36f1aad97fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py
index e49e480813a..ebede9469dd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,8 +45,7 @@ class NestedOneofToCheckValidationSemantics(
                 one_of_0 = schemas.NoneSchema
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def one_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +73,7 @@ class NestedOneofToCheckValidationSemantics(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi
index e49e480813a..ebede9469dd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,8 +45,7 @@ class NestedOneofToCheckValidationSemantics(
                 one_of_0 = schemas.NoneSchema
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def one_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
@@ -73,8 +73,7 @@ class NestedOneofToCheckValidationSemantics(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py
index a834b13a13a..f04fa2d4d95 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class NotMoreComplexSchema(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi
index a834b13a13a..f04fa2d4d95 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class NotMoreComplexSchema(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.py
index 93650f88ea2..02c363ec5f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class NulCharactersInStrings(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def HELLOTHERE(cls):
         return cls("hello\x00there")
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.pyi
index 93650f88ea2..02c363ec5f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nul_characters_in_strings.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class NulCharactersInStrings(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def HELLOTHERE(cls):
         return cls("hello\x00there")
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.py
index 0b2283eca2d..4b1bff62a13 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.pyi
index 0b2283eca2d..4b1bff62a13 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/null_type_matches_only_the_null_object.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.py
index bc6ca284a99..e4d1d79b975 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.pyi
index bc6ca284a99..e4d1d79b975 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/number_type_matches_numbers.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py
index 2ccc9143035..d74b394f069 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,29 +45,29 @@ class ObjectPropertiesValidation(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi
index 2ccc9143035..d74b394f069 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,29 +45,29 @@ class ObjectPropertiesValidation(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py
index f9921162f1d..072f28a7fbc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -59,8 +60,7 @@ class Oneof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi
index 4c790bb65ab..fcf3fb10220 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -58,8 +59,7 @@ class Oneof(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py
index e25fd20503a..b38b5751a71 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,23 +56,23 @@ class OneofComplexTypes(
             bar: MetaOapg.properties.bar
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -111,23 +112,23 @@ class OneofComplexTypes(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -147,8 +148,7 @@ class OneofComplexTypes(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi
index e25fd20503a..b38b5751a71 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,23 +56,23 @@ class OneofComplexTypes(
             bar: MetaOapg.properties.bar
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -111,23 +112,23 @@ class OneofComplexTypes(
             foo: MetaOapg.properties.foo
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -147,8 +148,7 @@ class OneofComplexTypes(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py
index 9793b9ff873..343181f8463 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -82,8 +83,7 @@ class OneofWithBaseSchema(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi
index ee7493013e4..dbd9a7fdf36 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -80,8 +81,7 @@ class OneofWithBaseSchema(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py
index 1954ee55795..d0339f57edb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class OneofWithEmptySchema(
         one_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi
index 1954ee55795..d0339f57edb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class OneofWithEmptySchema(
         one_of_1 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py
index 502c17fba7a..06bb23eddae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -94,8 +95,7 @@ class OneofWithRequired(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi
index 502c17fba7a..06bb23eddae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -94,8 +95,7 @@ class OneofWithRequired(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py
index 9c37d4f893f..48773cbbe50 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi
index 5cc8bc0bd13..d4c18e7fc23 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py
index c7bd7f6fb60..49594057cf8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi
index 68c9978091d..a2fb9d02f18 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py
index 24d6a27b009..7c73a200e5d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -52,53 +53,53 @@ class PropertiesWithEscapedCharacters(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\nbar"]) -> MetaOapg.properties.foo_nbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\nbar"]) -> MetaOapg.properties.foo_nbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\"bar"]) -> MetaOapg.properties.foo_bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\"bar"]) -> MetaOapg.properties.foo_bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\bar"]) -> MetaOapg.properties.foo__bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\\bar"]) -> MetaOapg.properties.foo__bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\rbar"]) -> MetaOapg.properties.foo_rbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\rbar"]) -> MetaOapg.properties.foo_rbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\tbar"]) -> MetaOapg.properties.foo_tbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\tbar"]) -> MetaOapg.properties.foo_tbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\fbar"]) -> MetaOapg.properties.foo_fbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\fbar"]) -> MetaOapg.properties.foo_fbar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi
index 24d6a27b009..7c73a200e5d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -52,53 +53,53 @@ class PropertiesWithEscapedCharacters(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\nbar"]) -> MetaOapg.properties.foo_nbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\nbar"]) -> MetaOapg.properties.foo_nbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\"bar"]) -> MetaOapg.properties.foo_bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\"bar"]) -> MetaOapg.properties.foo_bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\bar"]) -> MetaOapg.properties.foo__bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\\bar"]) -> MetaOapg.properties.foo__bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\rbar"]) -> MetaOapg.properties.foo_rbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\rbar"]) -> MetaOapg.properties.foo_rbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\tbar"]) -> MetaOapg.properties.foo_tbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\tbar"]) -> MetaOapg.properties.foo_tbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\fbar"]) -> MetaOapg.properties.foo_fbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\fbar"]) -> MetaOapg.properties.foo_fbar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py
index c914425049c..344414e9ccb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class PropertyNamedRefThatIsNotAReference(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$ref"]) -> MetaOapg.properties.ref: ...
+    def __getitem__(self, name: typing_extensions.Literal["$ref"]) -> MetaOapg.properties.ref: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["$ref", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["$ref", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["$ref", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["$ref", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi
index c914425049c..344414e9ccb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class PropertyNamedRefThatIsNotAReference(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$ref"]) -> MetaOapg.properties.ref: ...
+    def __getitem__(self, name: typing_extensions.Literal["$ref"]) -> MetaOapg.properties.ref: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["$ref", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["$ref", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["$ref", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["$ref", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py
index c21cd611da5..a15df310544 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class RefInAdditionalproperties(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def additional_properties(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def additional_properties() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
     
     def __getitem__(self, name: typing.Union[str, ]) -> 'PropertyNamedRefThatIsNotAReference':
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi
index c21cd611da5..a15df310544 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class RefInAdditionalproperties(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def additional_properties(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def additional_properties() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
     
     def __getitem__(self, name: typing.Union[str, ]) -> 'PropertyNamedRefThatIsNotAReference':
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py
index 2de501fa4a7..979c66540f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class RefInAllof(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi
index 2de501fa4a7..979c66540f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class RefInAllof(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py
index 4370f3b49b1..df7546c1c2b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class RefInAnyof(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi
index 4370f3b49b1..df7546c1c2b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class RefInAnyof(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py
index 4336f90122b..73663ab9c05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class RefInItems(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def items() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
     def __new__(
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.pyi
index 4336f90122b..73663ab9c05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class RefInItems(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def items() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
     def __new__(
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py
index 733ca32e7af..b1362b851ad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class RefInNot(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def not_schema() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi
index 733ca32e7af..b1362b851ad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class RefInNot(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def not_schema() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py
index 37864ea4df2..99be8069ed7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class RefInOneof(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi
index 37864ea4df2..99be8069ed7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class RefInOneof(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py
index 2c0ee55a649..00390b08058 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +37,8 @@ class RefInProperty(
         
         class properties:
         
-            @classmethod
-            @property
-            def a(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+            @staticmethod
+            def a() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
                 return PropertyNamedRefThatIsNotAReference
             __annotations__ = {
                 "a": a,
@@ -46,23 +46,23 @@ class RefInProperty(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> 'PropertyNamedRefThatIsNotAReference': ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> 'PropertyNamedRefThatIsNotAReference': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi
index 2c0ee55a649..00390b08058 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +37,8 @@ class RefInProperty(
         
         class properties:
         
-            @classmethod
-            @property
-            def a(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+            @staticmethod
+            def a() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
                 return PropertyNamedRefThatIsNotAReference
             __annotations__ = {
                 "a": a,
@@ -46,23 +46,23 @@ class RefInProperty(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> 'PropertyNamedRefThatIsNotAReference': ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> 'PropertyNamedRefThatIsNotAReference': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py
index 405d76c29de..464498e13fb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class RequiredDefaultValidation(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi
index 405d76c29de..464498e13fb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class RequiredDefaultValidation(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py
index a3005177abc..aa43367ca2e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,29 +50,29 @@ class RequiredValidation(
     foo: MetaOapg.properties.foo
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi
index a3005177abc..aa43367ca2e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,29 +50,29 @@ class RequiredValidation(
     foo: MetaOapg.properties.foo
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", "bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py
index 626a3dcd016..98018693bc1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class RequiredWithEmptyArray(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi
index 626a3dcd016..98018693bc1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,23 +43,23 @@ class RequiredWithEmptyArray(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py
index efe9b35400b..52a8999cd28 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi
index efe9b35400b..52a8999cd28 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.py
index 66ad1959870..bfa9cd3e29c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class SimpleEnumValidation(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_2(cls):
         return cls(2)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_3(cls):
         return cls(3)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.pyi
index 66ad1959870..bfa9cd3e29c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/simple_enum_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class SimpleEnumValidation(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_2(cls):
         return cls(2)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_3(cls):
         return cls(3)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.py
index 0549faf9571..573e83bc999 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.pyi
index 0549faf9571..573e83bc999 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/string_type_matches_strings.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
index 3d1202dab39..57a001ad752 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["alpha"]) -> MetaOapg.properties.alpha: ...
+    def __getitem__(self, name: typing_extensions.Literal["alpha"]) -> MetaOapg.properties.alpha: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["alpha", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["alpha", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["alpha", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["alpha", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
index f4cbc0f77e9..caec048424d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,23 +47,23 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["alpha"]) -> MetaOapg.properties.alpha: ...
+    def __getitem__(self, name: typing_extensions.Literal["alpha"]) -> MetaOapg.properties.alpha: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["alpha", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["alpha", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["alpha", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["alpha", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py
index ff92951a11e..485edf4e3c1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi
index 7b17a2388f2..c5ded11279a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py
index 25a3a5d827f..9fd610f6608 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi
index 6e623acc8df..175556c6807 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.py
index 94c3f085318..c8202e8dcc1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.pyi
index 94c3f085318..c8202e8dcc1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.py
index ec189721d83..8a66998c4f2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.pyi
index ec189721d83..8a66998c4f2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_reference_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.py
index 384bda61c53..50fb98bcac0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.pyi
index 384bda61c53..50fb98bcac0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uri_template_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.py
index 5d589d988aa..9d181743b1c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.pyi
index 555147c9dda..25e7fbd7895 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.py
index e849345e3b6..6b6aad1b775 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.pyi
index 827c8ee6ec4..b072f5769c2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.py
index cf40f37bc63..b5f0df3456a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.pyi
index 87e34a0177f..d575d1c6850 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.py
index a23ba87456f..b13a4db5f81 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.pyi
index 6100d68fd82..758b4e14580 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.py
index 45532f4d7e0..ed580b82ab2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.pyi
index ef34f3b054e..d499a70ec06 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.py
index 6f73be7c6e7..4eb46ceb57a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.pyi
index e8286d91b72..60ba6149f6d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.py
index c3c452186c4..4e2ae80d04e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.pyi
index 7ca171be1a6..e071ea77f17 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.py
index 28d3641c735..93d1a9272c8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.pyi
index b04a7889dcc..e44333eddad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.py
index 597293951d1..82f3d209656 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.pyi
index 1a01ffde7b7..06fd162a1f8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.py
index ff2df6e5dd7..f20c2387cf2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.pyi
index 5cc1038e6f4..1a72c9b8ae7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.py
index 6cf56ae166b..20eb1788e2f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.pyi
index fb210ad21a1..176c4f8b2cb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.py
index 3a4995b0e74..5f554b1a1d9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.pyi
index fae50f24ef9..19a2d2faa39 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.py
index 3a1ecd145e3..0352c3702f9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.pyi
index bd198adf040..192aa4f69c2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.py
index a282c016109..e3cdd801ce3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.pyi
index d673fb8d82c..0f5688da5f0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.py
index fcf09c2a822..6291b17d5db 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.pyi
index 4dd486cbba1..550f76088a4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.py
index 93accd2a9f4..7a0c2e75cb5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.pyi
index dcd1a19960c..bdffc46e920 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.py
index 9b7f0b6943a..0ea29561b94 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.pyi
index 816b2ab9ae7..eb6d81170cd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.py
index 5abec19af49..169b8b2a458 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.pyi
index 84f01a25a0d..d925f9924b0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.py
index 9947ac08cc4..d85026f9e85 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.pyi
index 266e0e175be..8c041d1c729 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_int_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.py
index be93e7f9ce6..94ae9d6b9dd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.pyi
index 2adbb93b45e..3993efa159e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_number_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.py
index e1692180297..0910a13fa3b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.pyi
index 3f0b584464b..36d5e3ab300 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_by_small_number_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.py
index 042f5d4b806..91a8f4e79e0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.pyi
index 8c8f06bc6d3..3b4aa6f83e8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_date_time_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.py
index 9f1a22e7778..61318d6c154 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.pyi
index 531cfb06e3c..58a00c65573 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_email_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.py
index a9653f2ce5e..70c9c4adb44 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.pyi
index 60e3eb3b4cc..e55ac837734 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.py
index 0c6af22ac62..3dd0079389c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.pyi
index 633540e57a0..ab02d1d291a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.py
index 692742a09a9..c494044acbb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.pyi
index 5cabcc7dbbc..1176a75ee70 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.py
index 542719ef1ee..402f766def6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.pyi
index ec13370fc6c..557cd7d28f9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.py
index d440daa610a..67e63b0793f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.pyi
index f6495eeb73d..9dca08f0d85 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.py
index 62d0bab902c..0027bd0edda 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.pyi
index cfcbc6ed277..7068a12c3f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.py
index b6504b040eb..48139406bbe 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.pyi
index 2511d4d78e7..d9a90d32798 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_forbidden_property_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.py
index 5ae1606e8a4..75bca7a9bdc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.pyi
index 4047b10dba1..ef40355adc4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_hostname_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.py
index e73dbf079a2..1c0ac97d064 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.pyi
index c9b4e1df18c..7dd7bffef9e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.py
index e4d90511817..849040ab750 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.pyi
index 364f1244739..f6b9fe70ca2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.py
index ff6ec1e33c8..024b72c736a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.pyi
index 892f11a20c8..43cd727410a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.py
index 97260e7e3e3..39e10fae46e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.pyi
index e73cdb05fee..3aba71094cd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv4_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.py
index b0b35976823..c2195715687 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.pyi
index b006dc2e80f..da20f09b8bf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ipv6_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.py
index 867af0ddbb5..86c63e8613d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.pyi
index 2c11566b8fa..cf655dc8344 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.py
index 52133e8c3ec..acc6b58ca35 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.pyi
index 6e855308da3..a0fe21e85a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.py
index 627bd4ca740..c4be0df8c1d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.pyi
index 2eae8530da3..bfa19c4e273 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.py
index 5371062591a..791e11c7e18 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.pyi
index b865e049d36..7ebf68559e8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.py
index 759b864eede..82baa3c6f74 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.pyi
index 1d17a1c09ef..389fa871253 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.py
index 04c3d6b82a7..0079983d6be 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.pyi
index db4475210a6..8b95b9db9ae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.py
index 70933fa69a8..302911bb647 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.pyi
index 12d56cd7187..d2d653f7f85 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.py
index bca536afa61..2a163fda70d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.pyi
index 932deba58e1..e9a2ca6e690 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.py
index 6cf26191826..ab89cbd51ae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.pyi
index 5fbaba5b85f..122e426ea13 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.py
index bc9cc9ef18f..790e6b1f164 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.pyi
index 3ad81204c7a..5ac55630f3e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minitems_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.py
index b1c54e4cb07..5dab68c54bb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.pyi
index d5d275e8142..efbd2d45237 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minlength_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.py
index 4b1ac5b5676..330ee1d7047 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.pyi
index 728d4e45b51..a92e09bb858 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.py
index 1b9df174760..7bb6109e924 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.pyi
index 6dbc80bcc1c..7958e9d7d5d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.py
index 3d6f89cb284..4779c8462af 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.pyi
index 9b177d35724..6e9b84a1841 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.py
index 1faeb4f1e19..c7755c17e60 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.pyi
index daac5dff3eb..6e7649ccf3b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_items_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.py
index 5e131873e21..f730d31d605 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.pyi
index 8fba43ad23e..61ea779a722 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py
index 43410750205..2d230e0cfb4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -50,23 +52,23 @@ class SchemaForRequestBodyApplicationJson(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.pyi
index 5498ab15c71..584ba00cf8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48,23 +50,23 @@ class SchemaForRequestBodyApplicationJson(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py
index df347fdf1f0..e7d0b186922 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi
index 31d80790461..b791ed43f46 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.py
index 775d63b1e1b..649b84303c0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.pyi
index cf6fa44b7d6..87a26d9477e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.py
index 500ec4593ae..84484c13f69 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.pyi
index 9647e5f5f1d..750f0f65ada 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.py
index 31ee731621f..2629e127692 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.pyi
index a211fd66d2d..38e54c85a2a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.py
index 0e311e70742..84ca8ee87d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.pyi
index 74e199bd954..8890fcc4f9c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.py
index 404b02fb864..2b0ee548440 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.pyi
index c09dc531ffc..0220145ecb8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.py
index 169f6045b90..e73ff6bb6c8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.pyi
index 828178f29ba..d2638823948 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.py
index 6f6dedf7be5..3cd6520a22e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.pyi
index fbac7449ec1..5d3b6b34a0e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.py
index 375cb4a0c99..62a4284268f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.pyi
index 1e816b2b6c7..eeb2e4277be 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.py
index 040ba2dc203..dc18b181d77 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.pyi
index 33535c96aa5..93b507c78ab 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.py
index 39d31e49deb..30049110ff0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.pyi
index a9471c7a3fc..330e13c653b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.py
index 59b661c7f16..e9f5746f22c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.pyi
index 93ebe455705..72d9dc32bb5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.py
index a4c1198d908..0aee314d2db 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.pyi
index 62bbee87504..014a5a449df 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_pattern_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.py
index 7b8476e2255..2e5a74862f3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.pyi
index 01d63ff5e1f..936055dcd88 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.py
index 9a37aca89b6..dbcef6a143c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.pyi
index 1cc57d20f76..85dcbf63183 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.py
index b4291bfc733..79a9a3d7463 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.pyi
index 8f941fa334d..8579929fbcb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.py
index d9b1c40e66f..dba5814622e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.pyi
index ba4fc510163..c2cf146102f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.py
index b489c1b41be..55240469c5a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.pyi
index d21ca8195f1..15fe13e71ce 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.py
index f48f0c4755f..7084e026966 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.pyi
index 398246d5093..92fe301b68b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_items_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py
index 9fe8bdd2ff6..67420c43809 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +39,8 @@ class SchemaForRequestBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def not_schema() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.pyi
index fc08626d571..b764ab5d1aa 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,9 +37,8 @@ class SchemaForRequestBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def not_schema() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.py
index 8f84345a461..bc819760be6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.pyi
index 5af5d8087ee..2c7e0962e03 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.py
index 072f6a374d4..c90390d3363 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.pyi
index 53029ae2c03..1c8577a746c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_property_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.py
index 8f07e1ca780..d69ac9a8f71 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.pyi
index 87a581b696d..2f164dcd785 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_default_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.py
index d699e0a6979..53032cc7358 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.pyi
index 8f564de339f..c8d141433cd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.py
index 59e112edd5f..d4e6b18bf56 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.pyi
index 2067194de90..05070e8b80e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py
index 9dbf8e9c1af..92d5b605383 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.pyi
index b9ed80af645..ddc024fd9d0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.py
index 5345bb5bb44..1b16f9380ec 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.pyi
index da8f35b389d..7bb345e5f68 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.py
index fb5d432f0b9..70baebb1f67 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.pyi
index 4f8899f1362..50d8f7f9f3b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.py
index 221fcb5e2a6..19e0a5ce46e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.pyi
index 3dbbff3d2c3..b0d69d7aa92 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.py
index 4c42d4d7ad2..fd7400f1110 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.pyi
index 8fd7d1c438a..03457ae0a3a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.py
index e0e837285ee..cf364bf948f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.pyi
index 2b07e457856..dfe7f9041cf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.py
index 892f3196f02..fe898546b5a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.pyi
index 9351f641433..7f3fa41ba21 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.py
index 902c9849617..49bd115c0c5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.pyi
index d3a7da6a052..a7fe122f3a1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.py
index 4604e2962de..aef3129629a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.pyi
index 848f7c20af0..e6ff0166fa6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_uri_template_format_request_body/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.py
index f9f5fe99317..d483b56496f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.pyi
index 72eca1ace58..db7eb165439 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.py
index 98533244fa4..43d6a536f11 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.pyi
index 2edc5451817..689d638523c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.py
index 8b86d102584..27943fe18ad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.pyi
index fab122c2abf..73cab792eb7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.py
index 8f4aaaf68c1..bd2a1a7f0d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.pyi
index c62009c3eb8..f5bddfa9488 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.py
index aa47aaae9be..ed6ee20d1ed 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.pyi
index d1084b7f491..28401bd1cd3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.py
index 652f096af52..bb8cfc8a815 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.pyi
index b0c9ed84889..d04ed5d067a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.py
index 73295c1908f..3503c97dde8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.pyi
index 0f44760d75a..7030b29ba8f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.py
index 6598aca2b91..6e77ac14228 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.pyi
index d718516ab35..dfbabc6c18f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.py
index eda0c68c3bd..edbc007e879 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.pyi
index 3d2ee623895..d189cb26e51 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.py
index 40a242ba36f..389f9b84206 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.pyi
index bfd3d1a1dc5..b467287f0a7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.py
index ae5b69b15d2..51c81cc92aa 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.pyi
index a2500fb7119..f502a2a7ec2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.py
index 7d948fee181..3abf1066253 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.pyi
index 1e37284e6f6..43650cf1372 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.py
index fd98c0195fa..23c53bc9e66 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.pyi
index c4014230275..507becb0fc7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.py
index 668a256c850..b12f52012a7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.pyi
index bd259f46932..9b227c718c2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.py
index 1afbaa31860..4d47659f0bd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.pyi
index c1e4e60219f..f1c8912f7b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.py
index c7d9c2302f1..5da32795327 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.pyi
index 0955b58908c..e59f582c862 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.py
index 9f614137d37..1414fa62e86 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.pyi
index ebc7ba6de70..d5676f03581 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.py
index 9f574cff1c0..a95f03b4e47 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.pyi
index 85d8591f4f4..8b5b589c464 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.py
index 7ff10edacc9..41034fa697c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.pyi
index e2591e939aa..61b3d81b320 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.py
index 8b18c46d733..e904ed1a382 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.pyi
index c330266cae9..3d9ebcd6a05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.py
index fbe437f79ff..2c4392f1e14 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.pyi
index 22c37efa5cc..62adbca6a88 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.py
index 521a8171874..f2376a2df1a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.pyi
index 52edc5c6d3b..18588164a4e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.py
index 91232038adc..a87120ac476 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.pyi
index d778b06d448..4429c79bc49 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.py
index 52fed193151..a87fc39eb2c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.pyi
index d911cee0abd..4fb57b1ddef 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.py
index 6c03a7fcfbb..d5b4bde7a65 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.pyi
index fb2335926bb..9f60984e680 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.py
index 108f2eaf75b..b37e49aabcd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.pyi
index 5043b737ad5..cdc047c43ee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.py
index 044da6eda93..98ebe09f381 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.pyi
index e304f34b5c0..ce05cb3a3bf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.py
index a240408971d..159ce75a12f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.pyi
index 6e1fcb25382..83e53e24ef9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.py
index fc8ea58faec..bc9fca72096 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.pyi
index ae6a2493f1d..3e30e6e6038 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.py
index f16619257e2..fad8e99f1ca 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.pyi
index 9bb128fe4b3..7d3e8754558 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.py
index 2641beac51f..188dcc891db 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.pyi
index 3bd2018f1be..d1d8399b74a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.py
index 791de52977c..70954d90690 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.pyi
index 3de2b2eeeed..de78604fa03 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.py
index c0378aff5d1..02dc4227f64 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.pyi
index 8d8ef9baa59..28222ab8884 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.py
index b46c984122b..35d6dd815ff 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.pyi
index e086ef309c2..98e0646ddd1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.py
index 741eb61477a..dacd310a9dc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.pyi
index e5f090dcd94..25cfffb07b7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.py
index 82af93d0f4d..435bb55a508 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.pyi
index 1839b17de7a..5d0ca450c00 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.py
index 0f84a6d7d43..4bca2876953 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.pyi
index ea393b976de..ee0046c4b61 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.py
index a65f0a3409b..b9415262a1b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.pyi
index d6f6eb3c85f..af9bf3e4498 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.py
index a3af8c9b646..7ae8eea54d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.pyi
index 80e3afb7d3a..f9b7b2d422c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.py
index d60cd175588..5a63caab151 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.pyi
index 72c459ea1ae..8a6f7dd62a4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.py
index c234ac03844..b6728ece2dc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.pyi
index 1fde7125da8..012642e4f12 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.py
index 773e704f4a7..9cd2ab6c996 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.pyi
index 9621f951326..62373744f4d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.py
index 28bd1296431..1e23926f48e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.pyi
index 1d20696526d..3e70643f892 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.py
index 907e9a7de0c..83e3cf4aa37 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.pyi
index e6ab1494634..79c039afac8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.py
index bb1f4cfeaab..2576206d66e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.pyi
index caf7b5916b0..6b009382922 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.py
index fa2c3b26a2c..c11c502c996 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.pyi
index 79a3e066d80..963b8250761 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.py
index b8e07bbcfb1..1df42fe4370 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.pyi
index 3f1f9326859..e2be043aa1f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.py
index 617b656a0a1..f0c3b54b66f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.pyi
index 8f2c529f363..9f96ff8fc18 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.py
index a41c46f5ed3..9c70aa0da91 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.pyi
index 1a6c6974490..c943fe0c343 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.py
index 24c71c5f7c2..ef2dfc15ad8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.pyi
index 1dca41dd735..57f3c654b5e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.py
index b096344fbbf..026c086eae7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.pyi
index 54000ec66f9..cd89ba08e85 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.py
index 7a5ddd3a3e2..741442c170a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.pyi
index 3a4083a3a7d..cc87b6112f3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py
index 810d8878f7f..13c61e239ae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +51,23 @@ class SchemaFor200ResponseBodyApplicationJson(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.pyi
index 9e669def894..fff2e73fd7b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -47,23 +49,23 @@ class SchemaFor200ResponseBodyApplicationJson(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["foo", ], str]):
                 return super().get_item_oapg(name)
             
         
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py
index e4097df4b51..c77e6647738 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.pyi
index 7ae90e93f9b..5f30622b8e8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.py
index 343a9c40f53..2c3c024b324 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.pyi
index fd74c3c4196..c16dc293e2b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.py
index c5074b2f20b..b715f683198 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.pyi
index d1f44346eee..89cde51ed05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.py
index 264bb4efbe3..271b13e2fe3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.pyi
index dc190902803..e945e45b29f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.py
index 0b8c204667e..475dc9ab22b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.pyi
index ca3943ed190..c58758a9b33 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.py
index 4f9c05858e6..5cc62d65ea3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.pyi
index 2909a56ef76..6a15b0be4a3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.py
index 4241a84d260..495b4e83a34 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.pyi
index 9f530000eeb..1de9c2812e4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.py
index bbc11c72e1f..0eef467c0c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.pyi
index 721a67abfc0..3c51bc63fac 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.py
index 42c987afda2..fbdb23c28b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.pyi
index cd1e6a451c2..20a5b3d90e6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.py
index 159642ae756..13d5070129a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.pyi
index 0f59fb24f6f..48c41793c51 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.py
index 298d72afdc1..75138d36053 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.pyi
index c1131f69330..ca3ec89b501 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.py
index d3851f8845c..9379092884f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.pyi
index d6cdec96d5b..97b297ceac9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.py
index 1f50114b1c4..cac793efa5a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.pyi
index 1fd3d3f5435..7b04aed8395 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.py
index 09df5b72443..8f5b60de978 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.pyi
index 464388f3196..ea8e9df1a04 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.py
index 0dbfd371584..211b708f84f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.pyi
index c3aa1926723..661d27604ef 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.py
index d82d734d9b7..3646ddfac53 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.pyi
index a084ba30407..2d2b7b1896b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.py
index e1ad5791022..ba246674237 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.pyi
index 4e78e221262..5056c8c3d8b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.py
index 8468b0c162a..e9c7e40f86b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.pyi
index 3ad71b94771..7979d632da5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.py
index d69cfd93f57..aba91337cb9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.pyi
index a2da4dfa495..556bcc20599 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py
index b9f01c0f0eb..bc13e0d26f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +38,8 @@ class SchemaFor200ResponseBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def not_schema() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.pyi
index 68f09071f6b..41a03ddcec4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +36,8 @@ class SchemaFor200ResponseBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
+        @staticmethod
+        def not_schema() -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.py
index 64286c3f892..4423ea94496 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.pyi
index 92fc8877b65..f86ae484464 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.py
index cb91ee9203c..a9eccf664bd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.pyi
index 5dfadfa5d05..220be3be534 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.py
index 2b65e204eb5..f7784ead0f1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.pyi
index c406c811134..33f98298747 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.py
index c2dca209de9..15344cdfa1b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.pyi
index 52f7b1b1e52..e0c69bcc704 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.py
index 5b14f80901d..545abfd36d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.pyi
index 5fa12af7537..2eed312b7b9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py
index d200e6968bc..7cea48d8b96 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.pyi
index d2e92e75924..f9918ddfeaf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.py
index a94992c8a5c..0b138868491 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.pyi
index 606b247e96b..cba5ecd2080 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.py
index bf63a85c1bb..24f9a28f289 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.pyi
index d8f405ba189..29eee86cd66 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.py
index 5d17694a37c..23de1c70c5f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.pyi
index c15b35c0d8c..e982ab5f7de 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.py
index a1d6958e4a3..32ec15a6bf7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.pyi
index 2e58176b1e2..6b02a890071 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.py
index 63998702522..531cab800b8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.pyi
index b4a7755eb74..642059237c3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.py
index 3d71e3c44c8..252fb5f0847 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.pyi
index d57bad9d7f6..718073cf867 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.py
index b8a1defada4..d160addbecc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.pyi
index 0942230e841..09e8886136d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.py
index 5ab024b1b1b..b418915fbaf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.pyi
index 8045d6f4179..7e04b30ce5d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py
index 42f72945672..b9539f2c244 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py
@@ -15,6 +15,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -183,9 +184,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -194,17 +203,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -256,6 +263,16 @@ class Schema:
             return "is {0}".format(all_class_names[0])
         return "is one of [{0}]".format(", ".join(all_class_names))
 
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
     @classmethod
     def __type_error_message(
         cls, var_value=None, var_name=None, valid_classes=None, key_type=None
@@ -863,39 +880,19 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
 class EnumMakerBase:
     pass
 
 
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
+def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> 'SchemaEnumMaker':
     class SchemaEnumMaker(EnumMakerBase):
         @classmethod
-        @property
         def _enum_value_to_name(
-                cls
+            cls
         ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
             pass
             try:
-                super_enum_value_to_name = super()._enum_value_to_name
+                super_enum_value_to_name = super()._enum_value_to_name()
             except AttributeError:
                 return enum_value_to_name
             intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
@@ -912,9 +909,9 @@ def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str,
             Validates that arg is in the enum's allowed values
             """
             try:
-                cls._enum_value_to_name[arg]
+                cls._enum_value_to_name()[arg]
             except KeyError:
-                raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name))
+                raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name()))
             return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
     return SchemaEnumMaker
@@ -1041,7 +1038,7 @@ class StrBase(ValidatorBase):
 
 class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -1107,7 +1104,7 @@ DEFAULT_ISOPARSER = CustomIsoparser()
 
 class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -1138,7 +1135,7 @@ class DateBase:
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -1175,7 +1172,7 @@ class DecimalBase:
     """
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -1344,6 +1341,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -1477,7 +1475,7 @@ class Discriminable:
         """
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -1492,21 +1490,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -1605,9 +1606,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -1678,7 +1677,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -1863,7 +1862,7 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -1879,7 +1878,7 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
@@ -1914,7 +1913,7 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
                 continue
@@ -2004,8 +2003,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -2374,10 +2374,12 @@ class BinarySchema(
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
     def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
         return super().__new__(cls, arg)
@@ -2456,7 +2458,7 @@ class DictSchema(
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
diff --git a/samples/openapi3/client/petstore/python-experimental/README.md b/samples/openapi3/client/petstore/python-experimental/README.md
index 668cc0f2a72..de83b18c1ff 100644
--- a/samples/openapi3/client/petstore/python-experimental/README.md
+++ b/samples/openapi3/client/petstore/python-experimental/README.md
@@ -9,9 +9,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 ## Requirements.
 
-Python &gt;&#x3D;3.9
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
+Python &gt;&#x3D;3.7
 
 ## Migration from other generators like python and python-legacy
 
@@ -52,6 +50,16 @@ object schema properties as classes
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
     and additionalProperty values
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
index 7f70052b8a9..b5d32822d19 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
@@ -20,6 +20,7 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 from urllib.parse import urlparse, quote
@@ -708,7 +709,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -720,7 +721,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -1269,7 +1270,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -1341,9 +1342,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/path_to_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/path_to_api.py
index b6a7d1053ec..271292fb870 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/path_to_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/path_to_api.py
@@ -1,4 +1,4 @@
-import typing
+import typing_extensions
 
 from petstore_api.paths import PathValues
 from petstore_api.apis.paths.foo import Foo
@@ -49,7 +49,7 @@ from petstore_api.apis.paths.fake_response_without_schema import FakeResponseWit
 from petstore_api.apis.paths.fake_json_patch import FakeJsonPatch
 from petstore_api.apis.paths.fake_delete_coffee_id import FakeDeleteCoffeeId
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
         PathValues.FOO: Foo,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_1.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_1.py
deleted file mode 100644
index 83062b30af2..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_1.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from petstore_api.paths.fake_1.get import ApiForget
-from petstore_api.paths.fake_1.post import ApiForpost
-from petstore_api.paths.fake_1.delete import ApiFordelete
-from petstore_api.paths.fake_1.patch import ApiForpatch
-
-
-class Fake(
-    ApiForget,
-    ApiForpost,
-    ApiFordelete,
-    ApiForpatch,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_2.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_2.py
deleted file mode 100644
index a34464be9ef..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_2.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from petstore_api.paths.fake_2.get import ApiForget
-from petstore_api.paths.fake_2.post import ApiForpost
-from petstore_api.paths.fake_2.delete import ApiFordelete
-from petstore_api.paths.fake_2.patch import ApiForpatch
-
-
-class Fake(
-    ApiForget,
-    ApiForpost,
-    ApiFordelete,
-    ApiForpatch,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_3.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_3.py
deleted file mode 100644
index 15eda063aac..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/fake_3.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from petstore_api.paths.fake_3.get import ApiForget
-from petstore_api.paths.fake_3.post import ApiForpost
-from petstore_api.paths.fake_3.delete import ApiFordelete
-from petstore_api.paths.fake_3.patch import ApiForpatch
-
-
-class Fake(
-    ApiForget,
-    ApiForpost,
-    ApiFordelete,
-    ApiForpatch,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_2.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_2.py
deleted file mode 100644
index b193d7a47ec..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_2.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from petstore_api.paths.pet_2.put import ApiForput
-from petstore_api.paths.pet_2.post import ApiForpost
-
-
-class Pet(
-    ApiForput,
-    ApiForpost,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_1.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_1.py
deleted file mode 100644
index 764781f23ad..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_1.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from petstore_api.paths.pet_pet_id_1.get import ApiForget
-from petstore_api.paths.pet_pet_id_1.post import ApiForpost
-from petstore_api.paths.pet_pet_id_1.delete import ApiFordelete
-
-
-class PetPetId(
-    ApiForget,
-    ApiForpost,
-    ApiFordelete,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_3.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_3.py
deleted file mode 100644
index 23ab2d0f235..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/pet_pet_id_3.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from petstore_api.paths.pet_pet_id_3.get import ApiForget
-from petstore_api.paths.pet_pet_id_3.post import ApiForpost
-from petstore_api.paths.pet_pet_id_3.delete import ApiFordelete
-
-
-class PetPetId(
-    ApiForget,
-    ApiForpost,
-    ApiFordelete,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/store_order_order_id_1.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/store_order_order_id_1.py
deleted file mode 100644
index e069792aafa..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/store_order_order_id_1.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from petstore_api.paths.store_order_order_id_1.get import ApiForget
-from petstore_api.paths.store_order_order_id_1.delete import ApiFordelete
-
-
-class StoreOrderOrderId(
-    ApiForget,
-    ApiFordelete,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_1.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_1.py
deleted file mode 100644
index ba5e52ba7b1..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_1.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from petstore_api.paths.user_username_1.get import ApiForget
-from petstore_api.paths.user_username_1.put import ApiForput
-from petstore_api.paths.user_username_1.delete import ApiFordelete
-
-
-class UserUsername(
-    ApiForget,
-    ApiForput,
-    ApiFordelete,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_2.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_2.py
deleted file mode 100644
index 053219f8e4f..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/paths/user_username_2.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from petstore_api.paths.user_username_2.get import ApiForget
-from petstore_api.paths.user_username_2.put import ApiForput
-from petstore_api.paths.user_username_2.delete import ApiFordelete
-
-
-class UserUsername(
-    ApiForget,
-    ApiForput,
-    ApiFordelete,
-):
-    pass
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tag_to_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tag_to_api.py
index c94ea467e25..ad42a5d1dec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tag_to_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tag_to_api.py
@@ -1,4 +1,4 @@
-import typing
+import typing_extensions
 
 from petstore_api.apis.tags import TagValues
 from petstore_api.apis.tags.pet_api import PetApi
@@ -9,7 +9,7 @@ from petstore_api.apis.tags.default_api import DefaultApi
 from petstore_api.apis.tags.fake_api import FakeApi
 from petstore_api.apis.tags.fake_classname_tags123_api import FakeClassnameTags123Api
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
         TagValues.PET: PetApi,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/fake_api.py
index d4ba07c2e38..a206fb090ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/fake_api.py
@@ -19,10 +19,10 @@ from petstore_api.paths.fake_case_sensitive_params.put import CaseSensitiveParam
 from petstore_api.paths.fake.patch import ClientModel
 from petstore_api.paths.fake_refs_composed_one_of_number_with_validations.post import ComposedOneOfDifferentTypes
 from petstore_api.paths.fake_delete_coffee_id.delete import DeleteCoffee
-from petstore_api.paths.fake_1.post import EndpointParameters
-from petstore_api.paths.fake_2.get import EnumParameters
+from petstore_api.paths.fake.post import EndpointParameters
+from petstore_api.paths.fake.get import EnumParameters
 from petstore_api.paths.fake_health.get import FakeHealthGet
-from petstore_api.paths.fake_3.delete import GroupParameters
+from petstore_api.paths.fake.delete import GroupParameters
 from petstore_api.paths.fake_inline_additional_properties.post import InlineAdditionalProperties
 from petstore_api.paths.fake_inline_composition_.post import InlineComposition
 from petstore_api.paths.fake_json_form_data.get import JsonFormData
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/pet_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/pet_api.py
index 65658ac47f2..402e69c9cfc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/pet_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/pet_api.py
@@ -13,9 +13,9 @@ from petstore_api.paths.pet.post import AddPet
 from petstore_api.paths.pet_pet_id.delete import DeletePet
 from petstore_api.paths.pet_find_by_status.get import FindPetsByStatus
 from petstore_api.paths.pet_find_by_tags.get import FindPetsByTags
-from petstore_api.paths.pet_pet_id_1.get import GetPetById
-from petstore_api.paths.pet_2.put import UpdatePet
-from petstore_api.paths.pet_pet_id_3.post import UpdatePetWithForm
+from petstore_api.paths.pet_pet_id.get import GetPetById
+from petstore_api.paths.pet.put import UpdatePet
+from petstore_api.paths.pet_pet_id.post import UpdatePetWithForm
 from petstore_api.paths.fake_pet_id_upload_image_with_required_file.post import UploadFileWithRequiredFile
 from petstore_api.paths.pet_pet_id_upload_image.post import UploadImage
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/store_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/store_api.py
index 941851b33aa..b9e1d09ed52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/store_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/store_api.py
@@ -11,7 +11,7 @@
 
 from petstore_api.paths.store_order_order_id.delete import DeleteOrder
 from petstore_api.paths.store_inventory.get import GetInventory
-from petstore_api.paths.store_order_order_id_1.get import GetOrderById
+from petstore_api.paths.store_order_order_id.get import GetOrderById
 from petstore_api.paths.store_order.post import PlaceOrder
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/user_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/user_api.py
index 0caffae395a..b84994811c1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/user_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/apis/tags/user_api.py
@@ -13,10 +13,10 @@ from petstore_api.paths.user.post import CreateUser
 from petstore_api.paths.user_create_with_array.post import CreateUsersWithArrayInput
 from petstore_api.paths.user_create_with_list.post import CreateUsersWithListInput
 from petstore_api.paths.user_username.delete import DeleteUser
-from petstore_api.paths.user_username_1.get import GetUserByName
+from petstore_api.paths.user_username.get import GetUserByName
 from petstore_api.paths.user_login.get import LoginUser
 from petstore_api.paths.user_logout.get import LogoutUser
-from petstore_api.paths.user_username_2.put import UpdateUser
+from petstore_api.paths.user_username.put import UpdateUser
 
 
 class UserApi(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 91c05f7740b..79ca58cf230 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -214,65 +215,65 @@ class AdditionalPropertiesClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_map_property"]) -> MetaOapg.properties.map_of_map_property: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_map_property"]) -> MetaOapg.properties.map_of_map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anytype_1"]) -> MetaOapg.properties.anytype_1: ...
+    def __getitem__(self, name: typing_extensions.Literal["anytype_1"]) -> MetaOapg.properties.anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_1: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_2: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_2: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_3: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_3: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["empty_map"]) -> MetaOapg.properties.empty_map: ...
+    def __getitem__(self, name: typing_extensions.Literal["empty_map"]) -> MetaOapg.properties.empty_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.properties.map_with_undeclared_properties_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.properties.map_with_undeclared_properties_string: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 91c05f7740b..79ca58cf230 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -214,65 +215,65 @@ class AdditionalPropertiesClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_map_property"]) -> MetaOapg.properties.map_of_map_property: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_map_property"]) -> MetaOapg.properties.map_of_map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anytype_1"]) -> MetaOapg.properties.anytype_1: ...
+    def __getitem__(self, name: typing_extensions.Literal["anytype_1"]) -> MetaOapg.properties.anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_1: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_2: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_2: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_3: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_3: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["empty_map"]) -> MetaOapg.properties.empty_map: ...
+    def __getitem__(self, name: typing_extensions.Literal["empty_map"]) -> MetaOapg.properties.empty_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.properties.map_with_undeclared_properties_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.properties.map_with_undeclared_properties_string: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.py
index 9096dd4344d..e139b252699 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -167,8 +168,7 @@ class AdditionalPropertiesValidator(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.pyi
index b992cdd524c..aa4a7355b2e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_validator.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -165,8 +166,7 @@ class AdditionalPropertiesValidator(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py
index d54514f3ae7..2a0bbc30313 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,9 +43,8 @@ class AdditionalPropertiesWithArrayOfEnums(
         
             class MetaOapg:
                 
-                @classmethod
-                @property
-                def items(cls) -> typing.Type['EnumClass']:
+                @staticmethod
+                def items() -> typing.Type['EnumClass']:
                     return EnumClass
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
index d54514f3ae7..2a0bbc30313 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -42,9 +43,8 @@ class AdditionalPropertiesWithArrayOfEnums(
         
             class MetaOapg:
                 
-                @classmethod
-                @property
-                def items(cls) -> typing.Type['EnumClass']:
+                @staticmethod
+                def items() -> typing.Type['EnumClass']:
                     return EnumClass
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
index 16f54752404..64fb96cfb9f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
index 16f54752404..64fb96cfb9f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 54684b754cc..06d7246fa33 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +38,8 @@ class Animal(
             "className",
         }
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'className': {
                     'Cat': Cat,
@@ -58,29 +58,29 @@ class Animal(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "color", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", "color", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 54684b754cc..06d7246fa33 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +38,8 @@ class Animal(
             "className",
         }
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'className': {
                     'Cat': Cat,
@@ -58,29 +58,29 @@ class Animal(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "color", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", "color", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
index 32ba10fdab3..082a4988ce7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class AnimalFarm(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Animal']:
+        @staticmethod
+        def items() -> typing.Type['Animal']:
             return Animal
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.pyi
index 32ba10fdab3..082a4988ce7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class AnimalFarm(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Animal']:
+        @staticmethod
+        def items() -> typing.Type['Animal']:
             return Animal
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.py
index 9d9640674b5..7bccdfa4161 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -264,71 +265,71 @@ class AnyTypeAndFormat(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date-time"]) -> MetaOapg.properties.date_time: ...
+    def __getitem__(self, name: typing_extensions.Literal["date-time"]) -> MetaOapg.properties.date_time: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date-time"]) -> typing.Union[MetaOapg.properties.date_time, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date-time"]) -> typing.Union[MetaOapg.properties.date_time, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number"]) -> typing.Union[MetaOapg.properties.number, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> typing.Union[MetaOapg.properties.number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.pyi
index 9d9640674b5..7bccdfa4161 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -264,71 +265,71 @@ class AnyTypeAndFormat(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date-time"]) -> MetaOapg.properties.date_time: ...
+    def __getitem__(self, name: typing_extensions.Literal["date-time"]) -> MetaOapg.properties.date_time: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date-time"]) -> typing.Union[MetaOapg.properties.date_time, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date-time"]) -> typing.Union[MetaOapg.properties.date_time, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number"]) -> typing.Union[MetaOapg.properties.number, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> typing.Union[MetaOapg.properties.number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["uuid", "date", "date-time", "number", "binary", "int32", "int64", "double", "float", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py
index 8595658ff92..993207a77f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
index 8595658ff92..993207a77f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 3377076f6fd..236e29d4e78 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45,35 +46,35 @@ class ApiResponse(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["code"]) -> MetaOapg.properties.code: ...
+    def __getitem__(self, name: typing_extensions.Literal["code"]) -> MetaOapg.properties.code: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["message"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal["message"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["code", "type", "message", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 3377076f6fd..236e29d4e78 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45,35 +46,35 @@ class ApiResponse(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["code"]) -> MetaOapg.properties.code: ...
+    def __getitem__(self, name: typing_extensions.Literal["code"]) -> MetaOapg.properties.code: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["message"]) -> MetaOapg.properties.message: ...
+    def __getitem__(self, name: typing_extensions.Literal["message"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["code", "type", "message", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py
index 648bd127aec..638edc274dc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -75,29 +76,29 @@ class Apple(
     cultivar: MetaOapg.properties.cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["origin"]) -> MetaOapg.properties.origin: ...
+    def __getitem__(self, name: typing_extensions.Literal["origin"]) -> MetaOapg.properties.origin: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["cultivar", "origin", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index 497e50744ee..95bd5e3a90a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62,29 +63,29 @@ class Apple(
     cultivar: MetaOapg.properties.cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["origin"]) -> MetaOapg.properties.origin: ...
+    def __getitem__(self, name: typing_extensions.Literal["origin"]) -> MetaOapg.properties.origin: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["cultivar", "origin", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index d5e04fef1e4..03d83c22cff 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,22 +50,22 @@ class AppleReq(
     cultivar: MetaOapg.properties.cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mealy"]) -> MetaOapg.properties.mealy: ...
+    def __getitem__(self, name: typing_extensions.Literal["mealy"]) -> MetaOapg.properties.mealy: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["cultivar"], typing_extensions.Literal["mealy"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["cultivar"], typing_extensions.Literal["mealy"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index d5e04fef1e4..03d83c22cff 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,22 +50,22 @@ class AppleReq(
     cultivar: MetaOapg.properties.cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mealy"]) -> MetaOapg.properties.mealy: ...
+    def __getitem__(self, name: typing_extensions.Literal["mealy"]) -> MetaOapg.properties.mealy: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["cultivar"], typing_extensions.Literal["mealy"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["cultivar"], typing_extensions.Literal["mealy"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py
index 8f499a27dd0..19b1c0e1a63 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.pyi
index 8f499a27dd0..19b1c0e1a63 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py
index 7c61f8f8832..5237741d838 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -85,23 +86,23 @@ class ArrayOfArrayOfNumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["ArrayArrayNumber", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index 7c61f8f8832..5237741d838 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -85,23 +86,23 @@ class ArrayOfArrayOfNumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["ArrayArrayNumber", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
index c1bef141be5..d7eb9d4838d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class ArrayOfEnums(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['StringEnum']:
+        @staticmethod
+        def items() -> typing.Type['StringEnum']:
             return StringEnum
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.pyi
index c1bef141be5..d7eb9d4838d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class ArrayOfEnums(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['StringEnum']:
+        @staticmethod
+        def items() -> typing.Type['StringEnum']:
             return StringEnum
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py
index 6a6e7207ce5..9c5a9b55d24 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -63,23 +64,23 @@ class ArrayOfNumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["ArrayNumber", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 6a6e7207ce5..9c5a9b55d24 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -63,23 +64,23 @@ class ArrayOfNumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["ArrayNumber", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py
index 3825e2b8501..d53b0df62d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -120,9 +121,8 @@ class ArrayTest(
                     
                         class MetaOapg:
                             
-                            @classmethod
-                            @property
-                            def items(cls) -> typing.Type['ReadOnlyFirst']:
+                            @staticmethod
+                            def items() -> typing.Type['ReadOnlyFirst']:
                                 return ReadOnlyFirst
                     
                         def __new__(
@@ -159,35 +159,35 @@ class ArrayTest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_integer"]) -> MetaOapg.properties.array_array_of_integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_integer"]) -> MetaOapg.properties.array_array_of_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> MetaOapg.properties.array_array_of_model: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_model"]) -> MetaOapg.properties.array_array_of_model: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index 3825e2b8501..d53b0df62d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -120,9 +121,8 @@ class ArrayTest(
                     
                         class MetaOapg:
                             
-                            @classmethod
-                            @property
-                            def items(cls) -> typing.Type['ReadOnlyFirst']:
+                            @staticmethod
+                            def items() -> typing.Type['ReadOnlyFirst']:
                                 return ReadOnlyFirst
                     
                         def __new__(
@@ -159,35 +159,35 @@ class ArrayTest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_integer"]) -> MetaOapg.properties.array_array_of_integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_integer"]) -> MetaOapg.properties.array_array_of_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> MetaOapg.properties.array_array_of_model: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_model"]) -> MetaOapg.properties.array_array_of_model: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py
index 5e563ce12e7..bfa5fe4afc9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.pyi
index 240b151923a..2f1d07e3287 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index 87ae6a8c08a..b3d1c7d792d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,23 +47,23 @@ class Banana(
     lengthCm: MetaOapg.properties.lengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["lengthCm", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index 87ae6a8c08a..b3d1c7d792d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,23 +47,23 @@ class Banana(
     lengthCm: MetaOapg.properties.lengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["lengthCm", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 48fde4d4941..1fdfa7d34ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,22 +50,22 @@ class BananaReq(
     lengthCm: MetaOapg.properties.lengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sweet"]) -> MetaOapg.properties.sweet: ...
+    def __getitem__(self, name: typing_extensions.Literal["sweet"]) -> MetaOapg.properties.sweet: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["lengthCm"], typing_extensions.Literal["sweet"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["lengthCm"], typing_extensions.Literal["sweet"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 48fde4d4941..1fdfa7d34ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,22 +50,22 @@ class BananaReq(
     lengthCm: MetaOapg.properties.lengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sweet"]) -> MetaOapg.properties.sweet: ...
+    def __getitem__(self, name: typing_extensions.Literal["sweet"]) -> MetaOapg.properties.sweet: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["lengthCm"], typing_extensions.Literal["sweet"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["lengthCm"], typing_extensions.Literal["sweet"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py
index 2a9bc73c0c7..d100ad83c56 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.pyi
index 2a9bc73c0c7..d100ad83c56 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/bar.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index ea00a644d5c..761184a89c4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class BasquePig(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def BASQUE_PIG(cls):
                     return cls("BasquePig")
             __annotations__ = {
@@ -60,23 +60,23 @@ class BasquePig(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index ea00a644d5c..761184a89c4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class BasquePig(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def BASQUE_PIG(cls):
                     return cls("BasquePig")
             __annotations__ = {
@@ -60,23 +60,23 @@ class BasquePig(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py
index dba78e0ef6b..6f667d4c0b4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.pyi
index dba78e0ef6b..6f667d4c0b4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py
index 3f05039831f..7f98942e76d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class BooleanEnum(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def TRUE(cls):
         return cls(schemas.BoolClass.TRUE)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.pyi
index 3f05039831f..7f98942e76d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/boolean_enum.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class BooleanEnum(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def TRUE(cls):
         return cls(schemas.BoolClass.TRUE)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index 830138af4a1..3dc195865d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,53 +52,53 @@ class Capitalization(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["CapitalCamel"]) -> MetaOapg.properties.CapitalCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["CapitalCamel"]) -> MetaOapg.properties.CapitalCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["small_Snake"]) -> MetaOapg.properties.small_Snake: ...
+    def __getitem__(self, name: typing_extensions.Literal["small_Snake"]) -> MetaOapg.properties.small_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["Capital_Snake"]) -> MetaOapg.properties.Capital_Snake: ...
+    def __getitem__(self, name: typing_extensions.Literal["Capital_Snake"]) -> MetaOapg.properties.Capital_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.properties.SCA_ETH_Flow_Points: ...
+    def __getitem__(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.properties.SCA_ETH_Flow_Points: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> MetaOapg.properties.ATT_NAME: ...
+    def __getitem__(self, name: typing_extensions.Literal["ATT_NAME"]) -> MetaOapg.properties.ATT_NAME: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index 830138af4a1..3dc195865d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,53 +52,53 @@ class Capitalization(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["CapitalCamel"]) -> MetaOapg.properties.CapitalCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["CapitalCamel"]) -> MetaOapg.properties.CapitalCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["small_Snake"]) -> MetaOapg.properties.small_Snake: ...
+    def __getitem__(self, name: typing_extensions.Literal["small_Snake"]) -> MetaOapg.properties.small_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["Capital_Snake"]) -> MetaOapg.properties.Capital_Snake: ...
+    def __getitem__(self, name: typing_extensions.Literal["Capital_Snake"]) -> MetaOapg.properties.Capital_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.properties.SCA_ETH_Flow_Points: ...
+    def __getitem__(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.properties.SCA_ETH_Flow_Points: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> MetaOapg.properties.ATT_NAME: ...
+    def __getitem__(self, name: typing_extensions.Literal["ATT_NAME"]) -> MetaOapg.properties.ATT_NAME: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py
index 3c714db7af3..da07def367b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class Cat(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
+            def __getitem__(self, name: typing_extensions.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["declawed", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["declawed", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -85,8 +86,7 @@ class Cat(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index 3c714db7af3..da07def367b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class Cat(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
+            def __getitem__(self, name: typing_extensions.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["declawed", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["declawed", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -85,8 +86,7 @@ class Cat(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py
index 237f5a3c60b..5537a4437bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48,29 +49,29 @@ class Category(
     name: MetaOapg.properties.name
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "id", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "id", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index 237f5a3c60b..5537a4437bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -48,29 +49,29 @@ class Category(
     name: MetaOapg.properties.name
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "id", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "id", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py
index 05b4cbc6ef5..32db862b8a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class ChildCat(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+            def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["name", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -85,8 +86,7 @@ class ChildCat(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 05b4cbc6ef5..32db862b8a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class ChildCat(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+            def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["name", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -85,8 +86,7 @@ class ChildCat(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py
index d753aea56ab..75d36e823c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,23 +45,23 @@ class ClassModel(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["_class"]) -> MetaOapg.properties._class: ...
+    def __getitem__(self, name: typing_extensions.Literal["_class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["_class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["_class", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["_class", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index d753aea56ab..75d36e823c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,23 +45,23 @@ class ClassModel(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["_class"]) -> MetaOapg.properties._class: ...
+    def __getitem__(self, name: typing_extensions.Literal["_class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["_class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["_class", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["_class", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 19584b4c5bc..4c7c16b564e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +42,23 @@ class Client(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["client"]) -> MetaOapg.properties.client: ...
+    def __getitem__(self, name: typing_extensions.Literal["client"]) -> MetaOapg.properties.client: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["client", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["client", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["client", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 19584b4c5bc..4c7c16b564e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +42,23 @@ class Client(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["client"]) -> MetaOapg.properties.client: ...
+    def __getitem__(self, name: typing_extensions.Literal["client"]) -> MetaOapg.properties.client: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["client", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["client", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["client", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py
index b6c2ada4d36..4cf54c5ff04 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class ComplexQuadrilateral(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def COMPLEX_QUADRILATERAL(cls):
                             return cls("ComplexQuadrilateral")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class ComplexQuadrilateral(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+            def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class ComplexQuadrilateral(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index b6c2ada4d36..4cf54c5ff04 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class ComplexQuadrilateral(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def COMPLEX_QUADRILATERAL(cls):
                             return cls("ComplexQuadrilateral")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class ComplexQuadrilateral(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+            def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class ComplexQuadrilateral(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py
index 6a1bb3dc3b7..9e077ff0db9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -73,8 +74,7 @@ class ComposedAnyOfDifferentTypesNoValidations(
         any_of_15 = schemas.Int64Schema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
index 6a1bb3dc3b7..9e077ff0db9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -73,8 +74,7 @@ class ComposedAnyOfDifferentTypesNoValidations(
         any_of_15 = schemas.Int64Schema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py
index 97d4d034587..41e7107528e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.pyi
index 97d4d034587..41e7107528e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py
index f2e06e68a8e..4a42a8626d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedBool(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.pyi
index f2e06e68a8e..4a42a8626d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedBool(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py
index 5beea3e9cd3..f442971abb0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedNone(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.pyi
index 5beea3e9cd3..f442971abb0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedNone(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py
index 7415eebde94..36f53dbf211 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedNumber(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.pyi
index 7415eebde94..36f53dbf211 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedNumber(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py
index fc6b19dd8d9..44171746f14 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedObject(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
index fc6b19dd8d9..44171746f14 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedObject(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py
index 4b0b0252683..790afa263ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -98,8 +99,7 @@ class ComposedOneOfDifferentTypes(
                 }]
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
index ed1917547cb..0fd6b4dd0f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -86,8 +87,7 @@ class ComposedOneOfDifferentTypes(
             pass
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py
index ce8df0741c6..50d61de1698 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedString(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.pyi
index ce8df0741c6..50d61de1698 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,8 +38,7 @@ class ComposedString(
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py
index 420748d594b..e1869aac84e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,12 +38,10 @@ class Currency(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EUR(cls):
         return cls("eur")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def USD(cls):
         return cls("usd")
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.pyi
index 420748d594b..e1869aac84e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/currency.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,12 +38,10 @@ class Currency(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EUR(cls):
         return cls("eur")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def USD(cls):
         return cls("usd")
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index a377ff111a7..119950e031d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class DanishPig(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def DANISH_PIG(cls):
                     return cls("DanishPig")
             __annotations__ = {
@@ -60,23 +60,23 @@ class DanishPig(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index a377ff111a7..119950e031d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class DanishPig(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def DANISH_PIG(cls):
                     return cls("DanishPig")
             __annotations__ = {
@@ -60,23 +60,23 @@ class DanishPig(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py
index 752f43e6270..1a616cac271 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.pyi
index 752f43e6270..1a616cac271 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_test.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py
index eb1680f6d62..8d9eaf992be 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.pyi
index f82f7a69bc6..2898b619005 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_time_with_validations.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py
index a89c8a4c94a..45d5ba99459 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.pyi
index a434304bc0f..52770358d18 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/date_with_validations.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py
index 11f8483f33c..8e3b63175a4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.pyi
index 11f8483f33c..8e3b63175a4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/decimal_payload.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py
index 2d3c45ee8e6..a8dd43038d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class Dog(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["breed"]) -> MetaOapg.properties.breed: ...
+            def __getitem__(self, name: typing_extensions.Literal["breed"]) -> MetaOapg.properties.breed: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["breed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["breed", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["breed", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -85,8 +86,7 @@ class Dog(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 2d3c45ee8e6..a8dd43038d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,23 +50,23 @@ class Dog(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["breed"]) -> MetaOapg.properties.breed: ...
+            def __getitem__(self, name: typing_extensions.Literal["breed"]) -> MetaOapg.properties.breed: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["breed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["breed", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["breed", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -85,8 +86,7 @@ class Dog(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py
index 1cc2c10c86a..9c7b54ae9cd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,19 +37,16 @@ class Drawing(
         
         class properties:
         
-            @classmethod
-            @property
-            def mainShape(cls) -> typing.Type['Shape']:
+            @staticmethod
+            def mainShape() -> typing.Type['Shape']:
                 return Shape
         
-            @classmethod
-            @property
-            def shapeOrNull(cls) -> typing.Type['ShapeOrNull']:
+            @staticmethod
+            def shapeOrNull() -> typing.Type['ShapeOrNull']:
                 return ShapeOrNull
         
-            @classmethod
-            @property
-            def nullableShape(cls) -> typing.Type['NullableShape']:
+            @staticmethod
+            def nullableShape() -> typing.Type['NullableShape']:
                 return NullableShape
             
             
@@ -59,9 +57,8 @@ class Drawing(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def items(cls) -> typing.Type['Shape']:
+                    @staticmethod
+                    def items() -> typing.Type['Shape']:
                         return Shape
             
                 def __new__(
@@ -84,46 +81,45 @@ class Drawing(
                 "shapes": shapes,
             }
         
-        @classmethod
-        @property
-        def additional_properties(cls) -> typing.Type['Fruit']:
+        @staticmethod
+        def additional_properties() -> typing.Type['Fruit']:
             return Fruit
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mainShape"]) -> 'Shape': ...
+    def __getitem__(self, name: typing_extensions.Literal["mainShape"]) -> 'Shape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeOrNull"]) -> 'ShapeOrNull': ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeOrNull"]) -> 'ShapeOrNull': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["nullableShape"]) -> 'NullableShape': ...
+    def __getitem__(self, name: typing_extensions.Literal["nullableShape"]) -> 'NullableShape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapes"]) -> MetaOapg.properties.shapes: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapes"]) -> MetaOapg.properties.shapes: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> 'Fruit': ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["mainShape"], typing_extensions.Literal["shapeOrNull"], typing_extensions.Literal["nullableShape"], typing_extensions.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["mainShape"], typing_extensions.Literal["shapeOrNull"], typing_extensions.Literal["nullableShape"], typing_extensions.Literal["shapes"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
index 1cc2c10c86a..9c7b54ae9cd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,19 +37,16 @@ class Drawing(
         
         class properties:
         
-            @classmethod
-            @property
-            def mainShape(cls) -> typing.Type['Shape']:
+            @staticmethod
+            def mainShape() -> typing.Type['Shape']:
                 return Shape
         
-            @classmethod
-            @property
-            def shapeOrNull(cls) -> typing.Type['ShapeOrNull']:
+            @staticmethod
+            def shapeOrNull() -> typing.Type['ShapeOrNull']:
                 return ShapeOrNull
         
-            @classmethod
-            @property
-            def nullableShape(cls) -> typing.Type['NullableShape']:
+            @staticmethod
+            def nullableShape() -> typing.Type['NullableShape']:
                 return NullableShape
             
             
@@ -59,9 +57,8 @@ class Drawing(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def items(cls) -> typing.Type['Shape']:
+                    @staticmethod
+                    def items() -> typing.Type['Shape']:
                         return Shape
             
                 def __new__(
@@ -84,46 +81,45 @@ class Drawing(
                 "shapes": shapes,
             }
         
-        @classmethod
-        @property
-        def additional_properties(cls) -> typing.Type['Fruit']:
+        @staticmethod
+        def additional_properties() -> typing.Type['Fruit']:
             return Fruit
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mainShape"]) -> 'Shape': ...
+    def __getitem__(self, name: typing_extensions.Literal["mainShape"]) -> 'Shape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeOrNull"]) -> 'ShapeOrNull': ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeOrNull"]) -> 'ShapeOrNull': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["nullableShape"]) -> 'NullableShape': ...
+    def __getitem__(self, name: typing_extensions.Literal["nullableShape"]) -> 'NullableShape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapes"]) -> MetaOapg.properties.shapes: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapes"]) -> MetaOapg.properties.shapes: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> 'Fruit': ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["mainShape"], typing_extensions.Literal["shapeOrNull"], typing_extensions.Literal["nullableShape"], typing_extensions.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["mainShape"], typing_extensions.Literal["shapeOrNull"], typing_extensions.Literal["nullableShape"], typing_extensions.Literal["shapes"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py
index 9e325438e81..0c2e685bcaf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -47,13 +48,11 @@ class EnumArrays(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def GREATER_THAN_EQUALS(cls):
                     return cls(">=")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def DOLLAR(cls):
                     return cls("$")
             
@@ -76,13 +75,11 @@ class EnumArrays(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def FISH(cls):
                             return cls("fish")
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def CRAB(cls):
                             return cls("crab")
             
@@ -105,29 +102,29 @@ class EnumArrays(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
+    def __getitem__(self, name: typing_extensions.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_enum"]) -> MetaOapg.properties.array_enum: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_enum"]) -> MetaOapg.properties.array_enum: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["just_symbol", "array_enum", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 9e325438e81..0c2e685bcaf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -47,13 +48,11 @@ class EnumArrays(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def GREATER_THAN_EQUALS(cls):
                     return cls(">=")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def DOLLAR(cls):
                     return cls("$")
             
@@ -76,13 +75,11 @@ class EnumArrays(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def FISH(cls):
                             return cls("fish")
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def CRAB(cls):
                             return cls("crab")
             
@@ -105,29 +102,29 @@ class EnumArrays(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
+    def __getitem__(self, name: typing_extensions.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_enum"]) -> MetaOapg.properties.array_enum: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_enum"]) -> MetaOapg.properties.array_enum: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["just_symbol", "array_enum", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py
index eb643e39374..8addfe28920 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -40,27 +41,22 @@ class EnumClass(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def _ABC(cls):
         return cls("_abc")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EFG(cls):
         return cls("-efg")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def XYZ(cls):
         return cls("(xyz)")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def COUNT_1M(cls):
         return cls("COUNT_1M")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def COUNT_50M(cls):
         return cls("COUNT_50M")
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.pyi
index eb643e39374..8addfe28920 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -40,27 +41,22 @@ class EnumClass(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def _ABC(cls):
         return cls("_abc")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EFG(cls):
         return cls("-efg")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def XYZ(cls):
         return cls("(xyz)")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def COUNT_1M(cls):
         return cls("COUNT_1M")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def COUNT_50M(cls):
         return cls("COUNT_50M")
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py
index 154e0af15e2..d96902e0d12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,18 +52,15 @@ class EnumTest(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def UPPER(cls):
                     return cls("UPPER")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def LOWER(cls):
                     return cls("lower")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def EMPTY(cls):
                     return cls("")
             
@@ -78,18 +76,15 @@ class EnumTest(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def UPPER(cls):
                     return cls("UPPER")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def LOWER(cls):
                     return cls("lower")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def EMPTY(cls):
                     return cls("")
             
@@ -104,13 +99,11 @@ class EnumTest(
                 schemas.Int32Schema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def POSITIVE_1(cls):
                     return cls(1)
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def NEGATIVE_1(cls):
                     return cls(-1)
             
@@ -125,39 +118,32 @@ class EnumTest(
                 schemas.Float64Schema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def POSITIVE_1_PT_1(cls):
                     return cls(1.1)
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def NEGATIVE_1_PT_2(cls):
                     return cls(-1.2)
         
-            @classmethod
-            @property
-            def stringEnum(cls) -> typing.Type['StringEnum']:
+            @staticmethod
+            def stringEnum() -> typing.Type['StringEnum']:
                 return StringEnum
         
-            @classmethod
-            @property
-            def IntegerEnum(cls) -> typing.Type['IntegerEnum']:
+            @staticmethod
+            def IntegerEnum() -> typing.Type['IntegerEnum']:
                 return IntegerEnum
         
-            @classmethod
-            @property
-            def StringEnumWithDefaultValue(cls) -> typing.Type['StringEnumWithDefaultValue']:
+            @staticmethod
+            def StringEnumWithDefaultValue() -> typing.Type['StringEnumWithDefaultValue']:
                 return StringEnumWithDefaultValue
         
-            @classmethod
-            @property
-            def IntegerEnumWithDefaultValue(cls) -> typing.Type['IntegerEnumWithDefaultValue']:
+            @staticmethod
+            def IntegerEnumWithDefaultValue() -> typing.Type['IntegerEnumWithDefaultValue']:
                 return IntegerEnumWithDefaultValue
         
-            @classmethod
-            @property
-            def IntegerEnumOneValue(cls) -> typing.Type['IntegerEnumOneValue']:
+            @staticmethod
+            def IntegerEnumOneValue() -> typing.Type['IntegerEnumOneValue']:
                 return IntegerEnumOneValue
             __annotations__ = {
                 "enum_string_required": enum_string_required,
@@ -174,71 +160,71 @@ class EnumTest(
     enum_string_required: MetaOapg.properties.enum_string_required
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_string"]) -> MetaOapg.properties.enum_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string"]) -> MetaOapg.properties.enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_integer"]) -> MetaOapg.properties.enum_integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_integer"]) -> MetaOapg.properties.enum_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_number"]) -> MetaOapg.properties.enum_number: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_number"]) -> MetaOapg.properties.enum_number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["stringEnum"]) -> 'StringEnum': ...
+    def __getitem__(self, name: typing_extensions.Literal["stringEnum"]) -> 'StringEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnum"]) -> 'IntegerEnum': ...
+    def __getitem__(self, name: typing_extensions.Literal["IntegerEnum"]) -> 'IntegerEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> 'StringEnumWithDefaultValue': ...
+    def __getitem__(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> 'StringEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> 'IntegerEnumWithDefaultValue': ...
+    def __getitem__(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> 'IntegerEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> 'IntegerEnumOneValue': ...
+    def __getitem__(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> 'IntegerEnumOneValue': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index 154e0af15e2..d96902e0d12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,18 +52,15 @@ class EnumTest(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def UPPER(cls):
                     return cls("UPPER")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def LOWER(cls):
                     return cls("lower")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def EMPTY(cls):
                     return cls("")
             
@@ -78,18 +76,15 @@ class EnumTest(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def UPPER(cls):
                     return cls("UPPER")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def LOWER(cls):
                     return cls("lower")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def EMPTY(cls):
                     return cls("")
             
@@ -104,13 +99,11 @@ class EnumTest(
                 schemas.Int32Schema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def POSITIVE_1(cls):
                     return cls(1)
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def NEGATIVE_1(cls):
                     return cls(-1)
             
@@ -125,39 +118,32 @@ class EnumTest(
                 schemas.Float64Schema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def POSITIVE_1_PT_1(cls):
                     return cls(1.1)
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def NEGATIVE_1_PT_2(cls):
                     return cls(-1.2)
         
-            @classmethod
-            @property
-            def stringEnum(cls) -> typing.Type['StringEnum']:
+            @staticmethod
+            def stringEnum() -> typing.Type['StringEnum']:
                 return StringEnum
         
-            @classmethod
-            @property
-            def IntegerEnum(cls) -> typing.Type['IntegerEnum']:
+            @staticmethod
+            def IntegerEnum() -> typing.Type['IntegerEnum']:
                 return IntegerEnum
         
-            @classmethod
-            @property
-            def StringEnumWithDefaultValue(cls) -> typing.Type['StringEnumWithDefaultValue']:
+            @staticmethod
+            def StringEnumWithDefaultValue() -> typing.Type['StringEnumWithDefaultValue']:
                 return StringEnumWithDefaultValue
         
-            @classmethod
-            @property
-            def IntegerEnumWithDefaultValue(cls) -> typing.Type['IntegerEnumWithDefaultValue']:
+            @staticmethod
+            def IntegerEnumWithDefaultValue() -> typing.Type['IntegerEnumWithDefaultValue']:
                 return IntegerEnumWithDefaultValue
         
-            @classmethod
-            @property
-            def IntegerEnumOneValue(cls) -> typing.Type['IntegerEnumOneValue']:
+            @staticmethod
+            def IntegerEnumOneValue() -> typing.Type['IntegerEnumOneValue']:
                 return IntegerEnumOneValue
             __annotations__ = {
                 "enum_string_required": enum_string_required,
@@ -174,71 +160,71 @@ class EnumTest(
     enum_string_required: MetaOapg.properties.enum_string_required
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_string"]) -> MetaOapg.properties.enum_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string"]) -> MetaOapg.properties.enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_integer"]) -> MetaOapg.properties.enum_integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_integer"]) -> MetaOapg.properties.enum_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_number"]) -> MetaOapg.properties.enum_number: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_number"]) -> MetaOapg.properties.enum_number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["stringEnum"]) -> 'StringEnum': ...
+    def __getitem__(self, name: typing_extensions.Literal["stringEnum"]) -> 'StringEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnum"]) -> 'IntegerEnum': ...
+    def __getitem__(self, name: typing_extensions.Literal["IntegerEnum"]) -> 'IntegerEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> 'StringEnumWithDefaultValue': ...
+    def __getitem__(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> 'StringEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> 'IntegerEnumWithDefaultValue': ...
+    def __getitem__(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> 'IntegerEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> 'IntegerEnumOneValue': ...
+    def __getitem__(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> 'IntegerEnumOneValue': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py
index 27c182fe36c..c184a9de47e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class EquilateralTriangle(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def EQUILATERAL_TRIANGLE(cls):
                             return cls("EquilateralTriangle")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class EquilateralTriangle(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+            def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class EquilateralTriangle(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index 27c182fe36c..c184a9de47e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class EquilateralTriangle(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def EQUILATERAL_TRIANGLE(cls):
                             return cls("EquilateralTriangle")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class EquilateralTriangle(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+            def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class EquilateralTriangle(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 0e227719815..886f7a62d34 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,23 +44,23 @@ class File(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
+    def __getitem__(self, name: typing_extensions.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["sourceURI", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 0e227719815..886f7a62d34 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,23 +44,23 @@ class File(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
+    def __getitem__(self, name: typing_extensions.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["sourceURI", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py
index 78c3247b4e0..e9320d9a0e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +37,8 @@ class FileSchemaTestClass(
         
         class properties:
         
-            @classmethod
-            @property
-            def file(cls) -> typing.Type['File']:
+            @staticmethod
+            def file() -> typing.Type['File']:
                 return File
             
             
@@ -49,9 +49,8 @@ class FileSchemaTestClass(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def items(cls) -> typing.Type['File']:
+                    @staticmethod
+                    def items() -> typing.Type['File']:
                         return File
             
                 def __new__(
@@ -73,29 +72,29 @@ class FileSchemaTestClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> 'File': ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> 'File': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["file", "files", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["file", "files", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 78c3247b4e0..e9320d9a0e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +37,8 @@ class FileSchemaTestClass(
         
         class properties:
         
-            @classmethod
-            @property
-            def file(cls) -> typing.Type['File']:
+            @staticmethod
+            def file() -> typing.Type['File']:
                 return File
             
             
@@ -49,9 +49,8 @@ class FileSchemaTestClass(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def items(cls) -> typing.Type['File']:
+                    @staticmethod
+                    def items() -> typing.Type['File']:
                         return File
             
                 def __new__(
@@ -73,29 +72,29 @@ class FileSchemaTestClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> 'File': ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> 'File': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["file", "files", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["file", "files", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index ffbe1dea830..ce7d00afa0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +42,23 @@ class Foo(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index ffbe1dea830..ce7d00afa0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +42,23 @@ class Foo(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py
index 2de0381e3c4..7f99f5b51ec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -207,143 +208,143 @@ class FormatTest(
     byte: MetaOapg.properties.byte
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32withValidations"]) -> MetaOapg.properties.int32withValidations: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32withValidations"]) -> MetaOapg.properties.int32withValidations: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float32"]) -> MetaOapg.properties.float32: ...
+    def __getitem__(self, name: typing_extensions.Literal["float32"]) -> MetaOapg.properties.float32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float64"]) -> MetaOapg.properties.float64: ...
+    def __getitem__(self, name: typing_extensions.Literal["float64"]) -> MetaOapg.properties.float64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["arrayWithUniqueItems"]) -> MetaOapg.properties.arrayWithUniqueItems: ...
+    def __getitem__(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> MetaOapg.properties.arrayWithUniqueItems: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuidNoExample"]) -> MetaOapg.properties.uuidNoExample: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuidNoExample"]) -> MetaOapg.properties.uuidNoExample: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits"]) -> MetaOapg.properties.pattern_with_digits: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits"]) -> MetaOapg.properties.pattern_with_digits: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.properties.pattern_with_digits_and_delimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.properties.pattern_with_digits_and_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["noneProp"]) -> MetaOapg.properties.noneProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["noneProp"]) -> MetaOapg.properties.noneProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index 54c03cc66e0..dc49d47fd8d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -159,143 +160,143 @@ class FormatTest(
     byte: MetaOapg.properties.byte
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32withValidations"]) -> MetaOapg.properties.int32withValidations: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32withValidations"]) -> MetaOapg.properties.int32withValidations: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float32"]) -> MetaOapg.properties.float32: ...
+    def __getitem__(self, name: typing_extensions.Literal["float32"]) -> MetaOapg.properties.float32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float64"]) -> MetaOapg.properties.float64: ...
+    def __getitem__(self, name: typing_extensions.Literal["float64"]) -> MetaOapg.properties.float64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["arrayWithUniqueItems"]) -> MetaOapg.properties.arrayWithUniqueItems: ...
+    def __getitem__(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> MetaOapg.properties.arrayWithUniqueItems: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuidNoExample"]) -> MetaOapg.properties.uuidNoExample: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuidNoExample"]) -> MetaOapg.properties.uuidNoExample: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits"]) -> MetaOapg.properties.pattern_with_digits: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits"]) -> MetaOapg.properties.pattern_with_digits: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.properties.pattern_with_digits_and_delimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.properties.pattern_with_digits_and_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["noneProp"]) -> MetaOapg.properties.noneProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["noneProp"]) -> MetaOapg.properties.noneProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py
index cc6a567af2a..056b33f22f5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,8 +42,7 @@ class Fruit(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -58,23 +58,23 @@ class Fruit(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index cc6a567af2a..056b33f22f5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,8 +42,7 @@ class Fruit(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -58,23 +58,23 @@ class Fruit(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py
index 6e7e7424508..18879cd45c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,8 +37,7 @@ class FruitReq(
         one_of_0 = schemas.NoneSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
index 6e7e7424508..18879cd45c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,8 +37,7 @@ class FruitReq(
         one_of_0 = schemas.NoneSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py
index 66092619b03..5646a4704e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,8 +42,7 @@ class GmFruit(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -58,23 +58,23 @@ class GmFruit(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 66092619b03..5646a4704e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,8 +42,7 @@ class GmFruit(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def any_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -58,23 +58,23 @@ class GmFruit(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["color", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index cb55a7f0de2..838d96a814f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +38,8 @@ class GrandparentAnimal(
             "pet_type",
         }
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'pet_type': {
                     'ChildCat': ChildCat,
@@ -56,23 +56,23 @@ class GrandparentAnimal(
     pet_type: MetaOapg.properties.pet_type
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
+    def __getitem__(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["pet_type", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["pet_type", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index cb55a7f0de2..838d96a814f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +38,8 @@ class GrandparentAnimal(
             "pet_type",
         }
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'pet_type': {
                     'ChildCat': ChildCat,
@@ -56,23 +56,23 @@ class GrandparentAnimal(
     pet_type: MetaOapg.properties.pet_type
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
+    def __getitem__(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["pet_type", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["pet_type", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index 9307f505f3d..f56f17aad80 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,29 +44,29 @@ class HasOnlyReadOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index 9307f505f3d..f56f17aad80 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,29 +44,29 @@ class HasOnlyReadOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", "foo", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py
index 1b21b55a65a..840a5ad96f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62,23 +63,23 @@ class HealthCheckResult(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["NullableMessage", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 1b21b55a65a..840a5ad96f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -62,23 +63,23 @@ class HealthCheckResult(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["NullableMessage", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py
index 5d41b025ac0..fa53ad2959f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class IntegerEnum(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_2(cls):
         return cls(2)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.pyi
index 5d41b025ac0..fa53ad2959f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class IntegerEnum(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_2(cls):
         return cls(2)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py
index 6264a49089b..6e931d02fd4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class IntegerEnumBig(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_10(cls):
         return cls(10)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_11(cls):
         return cls(11)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_12(cls):
         return cls(12)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.pyi
index 6264a49089b..6e931d02fd4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_big.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class IntegerEnumBig(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_10(cls):
         return cls(10)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_11(cls):
         return cls(11)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_12(cls):
         return cls(12)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py
index 3d7db09ce4a..29e4afe9416 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class IntegerEnumOneValue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.pyi
index 3d7db09ce4a..29e4afe9416 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_one_value.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,7 +37,6 @@ class IntegerEnumOneValue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py
index da4f1ac9ef6..11f2d028bef 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class IntegerEnumWithDefaultValue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_2(cls):
         return cls(2)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.pyi
index da4f1ac9ef6..11f2d028bef 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_enum_with_default_value.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class IntegerEnumWithDefaultValue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_0(cls):
         return cls(0)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_2(cls):
         return cls(2)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py
index 320a61055e0..c39215af60f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.pyi
index b1a4922d081..7e0c4ee3373 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_max10.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py
index e6dcb3af72d..7430ad6f5e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.pyi
index 3bae631106b..73d4df6c230 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/integer_min15.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py
index 15efebd452c..408ba30ae8a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class IsoscelesTriangle(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def ISOSCELES_TRIANGLE(cls):
                             return cls("IsoscelesTriangle")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class IsoscelesTriangle(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+            def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class IsoscelesTriangle(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index 15efebd452c..408ba30ae8a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class IsoscelesTriangle(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def ISOSCELES_TRIANGLE(cls):
                             return cls("IsoscelesTriangle")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class IsoscelesTriangle(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+            def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class IsoscelesTriangle(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.py
index 3ef832be70c..223b0c55127 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,8 +44,7 @@ class JSONPatchRequest(
             class MetaOapg:
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def one_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.pyi
index 3ef832be70c..223b0c55127 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,8 +44,7 @@ class JSONPatchRequest(
             class MetaOapg:
                 
                 @classmethod
-                @property
-                @functools.cache
+                @functools.lru_cache()
                 def one_of(cls):
                     # we need this here to make our import statements work
                     # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.py
index 76d6409b05a..d013295fd99 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,18 +56,15 @@ class JSONPatchRequestAddReplaceTest(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def ADD(cls):
                     return cls("add")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def REPLACE(cls):
                     return cls("replace")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def TEST(cls):
                     return cls("test")
             __annotations__ = {
@@ -81,28 +79,28 @@ class JSONPatchRequestAddReplaceTest(
     value: MetaOapg.properties.value
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["value"]) -> MetaOapg.properties.value: ...
+    def __getitem__(self, name: typing_extensions.Literal["value"]) -> MetaOapg.properties.value: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["value"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["value"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["value"]) -> MetaOapg.properties.value: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["value"]) -> MetaOapg.properties.value: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["value"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["value"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.pyi
index 76d6409b05a..d013295fd99 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_add_replace_test.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -55,18 +56,15 @@ class JSONPatchRequestAddReplaceTest(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def ADD(cls):
                     return cls("add")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def REPLACE(cls):
                     return cls("replace")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def TEST(cls):
                     return cls("test")
             __annotations__ = {
@@ -81,28 +79,28 @@ class JSONPatchRequestAddReplaceTest(
     value: MetaOapg.properties.value
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["value"]) -> MetaOapg.properties.value: ...
+    def __getitem__(self, name: typing_extensions.Literal["value"]) -> MetaOapg.properties.value: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["value"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["value"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["value"]) -> MetaOapg.properties.value: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["value"]) -> MetaOapg.properties.value: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["value"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["value"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.py
index ca8fa160d3a..7ff6a7bcfd9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,13 +55,11 @@ class JSONPatchRequestMoveCopy(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def MOVE(cls):
                     return cls("move")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def COPY(cls):
                     return cls("copy")
             __annotations__ = {
@@ -74,28 +73,28 @@ class JSONPatchRequestMoveCopy(
     path: MetaOapg.properties.path
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["from"]) -> MetaOapg.properties._from: ...
+    def __getitem__(self, name: typing_extensions.Literal["from"]) -> MetaOapg.properties._from: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["from"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["from"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["from"]) -> MetaOapg.properties._from: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["from"]) -> MetaOapg.properties._from: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["from"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["from"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.pyi
index ca8fa160d3a..7ff6a7bcfd9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_move_copy.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,13 +55,11 @@ class JSONPatchRequestMoveCopy(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def MOVE(cls):
                     return cls("move")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def COPY(cls):
                     return cls("copy")
             __annotations__ = {
@@ -74,28 +73,28 @@ class JSONPatchRequestMoveCopy(
     path: MetaOapg.properties.path
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["from"]) -> MetaOapg.properties._from: ...
+    def __getitem__(self, name: typing_extensions.Literal["from"]) -> MetaOapg.properties._from: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["from"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["from"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["from"]) -> MetaOapg.properties._from: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["from"]) -> MetaOapg.properties._from: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], typing.Literal["from"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], typing_extensions.Literal["from"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.py
index 9ab2b78ae15..ebe64d5ee09 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,8 +52,7 @@ class JSONPatchRequestRemove(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def REMOVE(cls):
                     return cls("remove")
             __annotations__ = {
@@ -65,22 +65,22 @@ class JSONPatchRequestRemove(
     path: MetaOapg.properties.path
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.pyi
index 9ab2b78ae15..ebe64d5ee09 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/json_patch_request_remove.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,8 +52,7 @@ class JSONPatchRequestRemove(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def REMOVE(cls):
                     return cls("remove")
             __annotations__ = {
@@ -65,22 +65,22 @@ class JSONPatchRequestRemove(
     path: MetaOapg.properties.path
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["op"]) -> MetaOapg.properties.op: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.properties.op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["path"]) -> MetaOapg.properties.path: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.properties.path: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["op"], typing.Literal["path"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["op"], typing_extensions.Literal["path"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py
index ea5638cf0fa..e90d419cc62 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Mammal(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'className': {
                     'Pig': Pig,
@@ -46,8 +46,7 @@ class Mammal(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
index ea5638cf0fa..e90d419cc62 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Mammal(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'className': {
                     'Pig': Pig,
@@ -46,8 +46,7 @@ class Mammal(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index 140faaa42f2..c5d70ab8075 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -112,13 +113,11 @@ class MapTest(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def UPPER(cls):
                             return cls("UPPER")
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def LOWER(cls):
                             return cls("lower")
                 
@@ -171,9 +170,8 @@ class MapTest(
                         **kwargs,
                     )
         
-            @classmethod
-            @property
-            def indirect_map(cls) -> typing.Type['StringBooleanMap']:
+            @staticmethod
+            def indirect_map() -> typing.Type['StringBooleanMap']:
                 return StringBooleanMap
             __annotations__ = {
                 "map_map_of_string": map_map_of_string,
@@ -183,41 +181,41 @@ class MapTest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_enum_string"]) -> MetaOapg.properties.map_of_enum_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_enum_string"]) -> MetaOapg.properties.map_of_enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["direct_map"]) -> MetaOapg.properties.direct_map: ...
+    def __getitem__(self, name: typing_extensions.Literal["direct_map"]) -> MetaOapg.properties.direct_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["indirect_map"]) -> 'StringBooleanMap': ...
+    def __getitem__(self, name: typing_extensions.Literal["indirect_map"]) -> 'StringBooleanMap': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index 140faaa42f2..c5d70ab8075 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -112,13 +113,11 @@ class MapTest(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def UPPER(cls):
                             return cls("UPPER")
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def LOWER(cls):
                             return cls("lower")
                 
@@ -171,9 +170,8 @@ class MapTest(
                         **kwargs,
                     )
         
-            @classmethod
-            @property
-            def indirect_map(cls) -> typing.Type['StringBooleanMap']:
+            @staticmethod
+            def indirect_map() -> typing.Type['StringBooleanMap']:
                 return StringBooleanMap
             __annotations__ = {
                 "map_map_of_string": map_map_of_string,
@@ -183,41 +181,41 @@ class MapTest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_enum_string"]) -> MetaOapg.properties.map_of_enum_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_enum_string"]) -> MetaOapg.properties.map_of_enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["direct_map"]) -> MetaOapg.properties.direct_map: ...
+    def __getitem__(self, name: typing_extensions.Literal["direct_map"]) -> MetaOapg.properties.direct_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["indirect_map"]) -> 'StringBooleanMap': ...
+    def __getitem__(self, name: typing_extensions.Literal["indirect_map"]) -> 'StringBooleanMap': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index e5bea736b37..b146d15b6a0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,9 +47,8 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def additional_properties(cls) -> typing.Type['Animal']:
+                    @staticmethod
+                    def additional_properties() -> typing.Type['Animal']:
                         return Animal
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
@@ -77,35 +77,35 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map"]) -> MetaOapg.properties.map: ...
+    def __getitem__(self, name: typing_extensions.Literal["map"]) -> MetaOapg.properties.map: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["uuid", "dateTime", "map", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index e5bea736b37..b146d15b6a0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,9 +47,8 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def additional_properties(cls) -> typing.Type['Animal']:
+                    @staticmethod
+                    def additional_properties() -> typing.Type['Animal']:
                         return Animal
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
@@ -77,35 +77,35 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map"]) -> MetaOapg.properties.map: ...
+    def __getitem__(self, name: typing_extensions.Literal["map"]) -> MetaOapg.properties.map: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["uuid", "dateTime", "map", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py
index 6cba7199b2b..7cdc34c5768 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,29 +47,29 @@ class Model200Response(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["class"]) -> MetaOapg.properties._class: ...
+    def __getitem__(self, name: typing_extensions.Literal["class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "class", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "class", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index 6cba7199b2b..7cdc34c5768 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,29 +47,29 @@ class Model200Response(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["class"]) -> MetaOapg.properties._class: ...
+    def __getitem__(self, name: typing_extensions.Literal["class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "class", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "class", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py
index ff67e26ab90..1549dc1120d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,23 +45,23 @@ class ModelReturn(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["return"]) -> MetaOapg.properties._return: ...
+    def __getitem__(self, name: typing_extensions.Literal["return"]) -> MetaOapg.properties._return: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["return", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["return", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["return", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index ff67e26ab90..1549dc1120d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,23 +45,23 @@ class ModelReturn(
 
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["return"]) -> MetaOapg.properties._return: ...
+    def __getitem__(self, name: typing_extensions.Literal["return"]) -> MetaOapg.properties._return: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["return", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["return", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["return", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index d17a419c70d..5804737d2f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,9 +42,8 @@ class Money(
         class properties:
             amount = schemas.DecimalSchema
         
-            @classmethod
-            @property
-            def currency(cls) -> typing.Type['Currency']:
+            @staticmethod
+            def currency() -> typing.Type['Currency']:
                 return Currency
             __annotations__ = {
                 "amount": amount,
@@ -54,29 +54,29 @@ class Money(
     currency: 'Currency'
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["amount"]) -> MetaOapg.properties.amount: ...
+    def __getitem__(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.properties.amount: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
+    def __getitem__(self, name: typing_extensions.Literal["currency"]) -> 'Currency': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["amount"]) -> MetaOapg.properties.amount: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.properties.amount: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["currency"]) -> 'Currency': ...
+    def get_item_oapg(self, name: typing_extensions.Literal["currency"]) -> 'Currency': ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["amount", "currency", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index d17a419c70d..5804737d2f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,9 +42,8 @@ class Money(
         class properties:
             amount = schemas.DecimalSchema
         
-            @classmethod
-            @property
-            def currency(cls) -> typing.Type['Currency']:
+            @staticmethod
+            def currency() -> typing.Type['Currency']:
                 return Currency
             __annotations__ = {
                 "amount": amount,
@@ -54,29 +54,29 @@ class Money(
     currency: 'Currency'
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["amount"]) -> MetaOapg.properties.amount: ...
+    def __getitem__(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.properties.amount: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
+    def __getitem__(self, name: typing_extensions.Literal["currency"]) -> 'Currency': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["amount"]) -> MetaOapg.properties.amount: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.properties.amount: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["currency"]) -> 'Currency': ...
+    def get_item_oapg(self, name: typing_extensions.Literal["currency"]) -> 'Currency': ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["amount", "currency", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py
index f02145ad8ba..e67d017f241 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -53,35 +54,35 @@ class Name(
     name: MetaOapg.properties.name
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["snake_case"]) -> MetaOapg.properties.snake_case: ...
+    def __getitem__(self, name: typing_extensions.Literal["snake_case"]) -> MetaOapg.properties.snake_case: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["property"]) -> MetaOapg.properties._property: ...
+    def __getitem__(self, name: typing_extensions.Literal["property"]) -> MetaOapg.properties._property: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "snake_case", "property", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index f02145ad8ba..e67d017f241 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -53,35 +54,35 @@ class Name(
     name: MetaOapg.properties.name
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["snake_case"]) -> MetaOapg.properties.snake_case: ...
+    def __getitem__(self, name: typing_extensions.Literal["snake_case"]) -> MetaOapg.properties.snake_case: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["property"]) -> MetaOapg.properties._property: ...
+    def __getitem__(self, name: typing_extensions.Literal["property"]) -> MetaOapg.properties._property: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "snake_case", "property", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index b91e8230739..cacfe6027ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,22 +50,22 @@ class NoAdditionalProperties(
     id: MetaOapg.properties.id
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id"], typing_extensions.Literal["petId"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id"], typing_extensions.Literal["petId"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index b91e8230739..cacfe6027ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,22 +50,22 @@ class NoAdditionalProperties(
     id: MetaOapg.properties.id
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id"], typing_extensions.Literal["petId"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id"], typing_extensions.Literal["petId"], ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py
index f5352628096..0d3c13b4576 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -453,88 +454,88 @@ class NullableClass(
                 )
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number_prop"]) -> MetaOapg.properties.number_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["number_prop"]) -> MetaOapg.properties.number_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["boolean_prop"]) -> MetaOapg.properties.boolean_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["boolean_prop"]) -> MetaOapg.properties.boolean_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string_prop"]) -> MetaOapg.properties.string_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["string_prop"]) -> MetaOapg.properties.string_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date_prop"]) -> MetaOapg.properties.date_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["date_prop"]) -> MetaOapg.properties.date_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["datetime_prop"]) -> MetaOapg.properties.datetime_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["datetime_prop"]) -> MetaOapg.properties.datetime_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_nullable_prop"]) -> MetaOapg.properties.array_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_nullable_prop"]) -> MetaOapg.properties.array_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_and_items_nullable_prop"]) -> MetaOapg.properties.array_and_items_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> MetaOapg.properties.array_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_items_nullable"]) -> MetaOapg.properties.array_items_nullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_items_nullable"]) -> MetaOapg.properties.array_items_nullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_nullable_prop"]) -> MetaOapg.properties.object_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_nullable_prop"]) -> MetaOapg.properties.object_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_and_items_nullable_prop"]) -> MetaOapg.properties.object_and_items_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> MetaOapg.properties.object_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_items_nullable"]) -> MetaOapg.properties.object_items_nullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_items_nullable"]) -> MetaOapg.properties.object_items_nullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> MetaOapg.additional_properties: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["integer_prop"], typing_extensions.Literal["number_prop"], typing_extensions.Literal["boolean_prop"], typing_extensions.Literal["string_prop"], typing_extensions.Literal["date_prop"], typing_extensions.Literal["datetime_prop"], typing_extensions.Literal["array_nullable_prop"], typing_extensions.Literal["array_and_items_nullable_prop"], typing_extensions.Literal["array_items_nullable"], typing_extensions.Literal["object_nullable_prop"], typing_extensions.Literal["object_and_items_nullable_prop"], typing_extensions.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["integer_prop"], typing_extensions.Literal["number_prop"], typing_extensions.Literal["boolean_prop"], typing_extensions.Literal["string_prop"], typing_extensions.Literal["date_prop"], typing_extensions.Literal["datetime_prop"], typing_extensions.Literal["array_nullable_prop"], typing_extensions.Literal["array_and_items_nullable_prop"], typing_extensions.Literal["array_items_nullable"], typing_extensions.Literal["object_nullable_prop"], typing_extensions.Literal["object_and_items_nullable_prop"], typing_extensions.Literal["object_items_nullable"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index f5352628096..0d3c13b4576 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -453,88 +454,88 @@ class NullableClass(
                 )
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number_prop"]) -> MetaOapg.properties.number_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["number_prop"]) -> MetaOapg.properties.number_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["boolean_prop"]) -> MetaOapg.properties.boolean_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["boolean_prop"]) -> MetaOapg.properties.boolean_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string_prop"]) -> MetaOapg.properties.string_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["string_prop"]) -> MetaOapg.properties.string_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date_prop"]) -> MetaOapg.properties.date_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["date_prop"]) -> MetaOapg.properties.date_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["datetime_prop"]) -> MetaOapg.properties.datetime_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["datetime_prop"]) -> MetaOapg.properties.datetime_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_nullable_prop"]) -> MetaOapg.properties.array_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_nullable_prop"]) -> MetaOapg.properties.array_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_and_items_nullable_prop"]) -> MetaOapg.properties.array_and_items_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> MetaOapg.properties.array_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_items_nullable"]) -> MetaOapg.properties.array_items_nullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_items_nullable"]) -> MetaOapg.properties.array_items_nullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_nullable_prop"]) -> MetaOapg.properties.object_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_nullable_prop"]) -> MetaOapg.properties.object_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_and_items_nullable_prop"]) -> MetaOapg.properties.object_and_items_nullable_prop: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> MetaOapg.properties.object_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_items_nullable"]) -> MetaOapg.properties.object_items_nullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_items_nullable"]) -> MetaOapg.properties.object_items_nullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> MetaOapg.additional_properties: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["integer_prop"], typing_extensions.Literal["number_prop"], typing_extensions.Literal["boolean_prop"], typing_extensions.Literal["string_prop"], typing_extensions.Literal["date_prop"], typing_extensions.Literal["datetime_prop"], typing_extensions.Literal["array_nullable_prop"], typing_extensions.Literal["array_and_items_nullable_prop"], typing_extensions.Literal["array_items_nullable"], typing_extensions.Literal["object_nullable_prop"], typing_extensions.Literal["object_and_items_nullable_prop"], typing_extensions.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["integer_prop"], typing_extensions.Literal["number_prop"], typing_extensions.Literal["boolean_prop"], typing_extensions.Literal["string_prop"], typing_extensions.Literal["date_prop"], typing_extensions.Literal["datetime_prop"], typing_extensions.Literal["array_nullable_prop"], typing_extensions.Literal["array_and_items_nullable_prop"], typing_extensions.Literal["array_items_nullable"], typing_extensions.Literal["object_nullable_prop"], typing_extensions.Literal["object_and_items_nullable_prop"], typing_extensions.Literal["object_items_nullable"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py
index 4420c82300b..e22e8d824e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,8 +39,7 @@ class NullableShape(
         one_of_2 = schemas.NoneSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
index 4420c82300b..e22e8d824e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,8 +39,7 @@ class NullableShape(
         one_of_2 = schemas.NoneSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py
index 3823a869e7e..94353cf0fd2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.pyi
index 3823a869e7e..94353cf0fd2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py
index 22ab604f1fb..7210b911ced 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.pyi
index 22ab604f1fb..7210b911ced 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 819c65f8f7a..91aaaa507b8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +42,23 @@ class NumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["JustNumber", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 819c65f8f7a..91aaaa507b8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +42,23 @@ class NumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["JustNumber", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py
index 79886743df3..f8b63e35856 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.pyi
index dd5a7cbbfde..4e92a920061 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_with_validations.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
index 97a74edad7e..05dc6ddd565 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
index 97a74edad7e..05dc6ddd565 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index 5f1131e8eb6..e68caff8717 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,9 +39,8 @@ class ObjectModelWithRefProps(
         
         class properties:
         
-            @classmethod
-            @property
-            def myNumber(cls) -> typing.Type['NumberWithValidations']:
+            @staticmethod
+            def myNumber() -> typing.Type['NumberWithValidations']:
                 return NumberWithValidations
             myString = schemas.StrSchema
             myBoolean = schemas.BoolSchema
@@ -51,35 +51,35 @@ class ObjectModelWithRefProps(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myNumber"]) -> 'NumberWithValidations': ...
+    def __getitem__(self, name: typing_extensions.Literal["myNumber"]) -> 'NumberWithValidations': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myString"]) -> MetaOapg.properties.myString: ...
+    def __getitem__(self, name: typing_extensions.Literal["myString"]) -> MetaOapg.properties.myString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myBoolean"]) -> MetaOapg.properties.myBoolean: ...
+    def __getitem__(self, name: typing_extensions.Literal["myBoolean"]) -> MetaOapg.properties.myBoolean: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["myNumber", "myString", "myBoolean", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index 5f1131e8eb6..e68caff8717 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,9 +39,8 @@ class ObjectModelWithRefProps(
         
         class properties:
         
-            @classmethod
-            @property
-            def myNumber(cls) -> typing.Type['NumberWithValidations']:
+            @staticmethod
+            def myNumber() -> typing.Type['NumberWithValidations']:
                 return NumberWithValidations
             myString = schemas.StrSchema
             myBoolean = schemas.BoolSchema
@@ -51,35 +51,35 @@ class ObjectModelWithRefProps(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myNumber"]) -> 'NumberWithValidations': ...
+    def __getitem__(self, name: typing_extensions.Literal["myNumber"]) -> 'NumberWithValidations': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myString"]) -> MetaOapg.properties.myString: ...
+    def __getitem__(self, name: typing_extensions.Literal["myString"]) -> MetaOapg.properties.myString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myBoolean"]) -> MetaOapg.properties.myBoolean: ...
+    def __getitem__(self, name: typing_extensions.Literal["myBoolean"]) -> MetaOapg.properties.myBoolean: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["myNumber", "myString", "myBoolean", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index 31b628c87ea..068f21457bc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,9 +39,8 @@ class ObjectWithDecimalProperties(
             length = schemas.DecimalSchema
             width = schemas.DecimalSchema
         
-            @classmethod
-            @property
-            def cost(cls) -> typing.Type['Money']:
+            @staticmethod
+            def cost() -> typing.Type['Money']:
                 return Money
             __annotations__ = {
                 "length": length,
@@ -49,35 +49,35 @@ class ObjectWithDecimalProperties(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["length"]) -> MetaOapg.properties.length: ...
+    def __getitem__(self, name: typing_extensions.Literal["length"]) -> MetaOapg.properties.length: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["width"]) -> MetaOapg.properties.width: ...
+    def __getitem__(self, name: typing_extensions.Literal["width"]) -> MetaOapg.properties.width: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cost"]) -> 'Money': ...
+    def __getitem__(self, name: typing_extensions.Literal["cost"]) -> 'Money': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["length", "width", "cost", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index 31b628c87ea..068f21457bc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,9 +39,8 @@ class ObjectWithDecimalProperties(
             length = schemas.DecimalSchema
             width = schemas.DecimalSchema
         
-            @classmethod
-            @property
-            def cost(cls) -> typing.Type['Money']:
+            @staticmethod
+            def cost() -> typing.Type['Money']:
                 return Money
             __annotations__ = {
                 "length": length,
@@ -49,35 +49,35 @@ class ObjectWithDecimalProperties(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["length"]) -> MetaOapg.properties.length: ...
+    def __getitem__(self, name: typing_extensions.Literal["length"]) -> MetaOapg.properties.length: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["width"]) -> MetaOapg.properties.width: ...
+    def __getitem__(self, name: typing_extensions.Literal["width"]) -> MetaOapg.properties.width: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cost"]) -> 'Money': ...
+    def __getitem__(self, name: typing_extensions.Literal["cost"]) -> 'Money': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["length", "width", "cost", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index 12523ceafe5..0e6aa7d4a1f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,35 +52,35 @@ class ObjectWithDifficultlyNamedProps(
     
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
+    def __getitem__(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$special[property.name]"]) -> MetaOapg.properties.special_property_name: ...
+    def __getitem__(self, name: typing_extensions.Literal["$special[property.name]"]) -> MetaOapg.properties.special_property_name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["123Number"]) -> MetaOapg.properties._123_number: ...
+    def __getitem__(self, name: typing_extensions.Literal["123Number"]) -> MetaOapg.properties._123_number: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index 12523ceafe5..0e6aa7d4a1f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,35 +52,35 @@ class ObjectWithDifficultlyNamedProps(
     
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
+    def __getitem__(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$special[property.name]"]) -> MetaOapg.properties.special_property_name: ...
+    def __getitem__(self, name: typing_extensions.Literal["$special[property.name]"]) -> MetaOapg.properties.special_property_name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["123Number"]) -> MetaOapg.properties._123_number: ...
+    def __getitem__(self, name: typing_extensions.Literal["123Number"]) -> MetaOapg.properties._123_number: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py
index 1c8da1560dc..31e422370ff 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class ObjectWithInlineCompositionProperty(
                             min_length = 1
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -86,23 +86,23 @@ class ObjectWithInlineCompositionProperty(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 31f6e1026f8..294520bd232 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,8 +52,7 @@ class ObjectWithInlineCompositionProperty(
                         pass
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -83,23 +83,23 @@ class ObjectWithInlineCompositionProperty(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
index 755a0dda7ae..50c22698177 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
index a0a059188e8..f45e30eed5f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index e6ebd27e891..817fb58ac79 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -52,18 +53,15 @@ class Order(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def PLACED(cls):
                     return cls("placed")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def APPROVED(cls):
                     return cls("approved")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def DELIVERED(cls):
                     return cls("delivered")
             complete = schemas.BoolSchema
@@ -77,53 +75,53 @@ class Order(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["quantity"]) -> MetaOapg.properties.quantity: ...
+    def __getitem__(self, name: typing_extensions.Literal["quantity"]) -> MetaOapg.properties.quantity: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shipDate"]) -> MetaOapg.properties.shipDate: ...
+    def __getitem__(self, name: typing_extensions.Literal["shipDate"]) -> MetaOapg.properties.shipDate: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["complete"]) -> MetaOapg.properties.complete: ...
+    def __getitem__(self, name: typing_extensions.Literal["complete"]) -> MetaOapg.properties.complete: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index e6ebd27e891..817fb58ac79 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -52,18 +53,15 @@ class Order(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def PLACED(cls):
                     return cls("placed")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def APPROVED(cls):
                     return cls("approved")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def DELIVERED(cls):
                     return cls("delivered")
             complete = schemas.BoolSchema
@@ -77,53 +75,53 @@ class Order(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["quantity"]) -> MetaOapg.properties.quantity: ...
+    def __getitem__(self, name: typing_extensions.Literal["quantity"]) -> MetaOapg.properties.quantity: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shipDate"]) -> MetaOapg.properties.shipDate: ...
+    def __getitem__(self, name: typing_extensions.Literal["shipDate"]) -> MetaOapg.properties.shipDate: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["complete"]) -> MetaOapg.properties.complete: ...
+    def __getitem__(self, name: typing_extensions.Literal["complete"]) -> MetaOapg.properties.complete: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py
index 3d682113c67..178eab4e5a1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,9 +36,8 @@ class ParentPet(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'pet_type': {
                     'ChildCat': ChildCat,
@@ -45,8 +45,7 @@ class ParentPet(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
index 3d682113c67..178eab4e5a1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,9 +36,8 @@ class ParentPet(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'pet_type': {
                     'ChildCat': ChildCat,
@@ -45,8 +45,7 @@ class ParentPet(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py
index d7f9a873c45..cc5bd6a5a7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -67,9 +68,8 @@ class Pet(
                     return super().__getitem__(i)
             id = schemas.Int64Schema
         
-            @classmethod
-            @property
-            def category(cls) -> typing.Type['Category']:
+            @staticmethod
+            def category() -> typing.Type['Category']:
                 return Category
             
             
@@ -80,9 +80,8 @@ class Pet(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def items(cls) -> typing.Type['Tag']:
+                    @staticmethod
+                    def items() -> typing.Type['Tag']:
                         return Tag
             
                 def __new__(
@@ -111,18 +110,15 @@ class Pet(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def AVAILABLE(cls):
                     return cls("available")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def PENDING(cls):
                     return cls("pending")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def SOLD(cls):
                     return cls("sold")
             __annotations__ = {
@@ -138,53 +134,53 @@ class Pet(
     name: MetaOapg.properties.name
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    def __getitem__(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["category"]) -> 'Category': ...
+    def __getitem__(self, name: typing_extensions.Literal["category"]) -> 'Category': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["tags"]) -> MetaOapg.properties.tags: ...
+    def __getitem__(self, name: typing_extensions.Literal["tags"]) -> MetaOapg.properties.tags: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index d7f9a873c45..cc5bd6a5a7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -67,9 +68,8 @@ class Pet(
                     return super().__getitem__(i)
             id = schemas.Int64Schema
         
-            @classmethod
-            @property
-            def category(cls) -> typing.Type['Category']:
+            @staticmethod
+            def category() -> typing.Type['Category']:
                 return Category
             
             
@@ -80,9 +80,8 @@ class Pet(
             
                 class MetaOapg:
                     
-                    @classmethod
-                    @property
-                    def items(cls) -> typing.Type['Tag']:
+                    @staticmethod
+                    def items() -> typing.Type['Tag']:
                         return Tag
             
                 def __new__(
@@ -111,18 +110,15 @@ class Pet(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def AVAILABLE(cls):
                     return cls("available")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def PENDING(cls):
                     return cls("pending")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def SOLD(cls):
                     return cls("sold")
             __annotations__ = {
@@ -138,53 +134,53 @@ class Pet(
     name: MetaOapg.properties.name
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    def __getitem__(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["category"]) -> 'Category': ...
+    def __getitem__(self, name: typing_extensions.Literal["category"]) -> 'Category': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["tags"]) -> MetaOapg.properties.tags: ...
+    def __getitem__(self, name: typing_extensions.Literal["tags"]) -> MetaOapg.properties.tags: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py
index b56f76aa425..db4887c110e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Pig(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'className': {
                     'BasquePig': BasquePig,
@@ -45,8 +45,7 @@ class Pig(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
index b56f76aa425..db4887c110e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Pig(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'className': {
                     'BasquePig': BasquePig,
@@ -45,8 +45,7 @@ class Pig(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 15ae3178b94..d08a18d2ee5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -39,9 +40,8 @@ class Player(
         class properties:
             name = schemas.StrSchema
         
-            @classmethod
-            @property
-            def enemyPlayer(cls) -> typing.Type['Player']:
+            @staticmethod
+            def enemyPlayer() -> typing.Type['Player']:
                 return Player
             __annotations__ = {
                 "name": name,
@@ -49,29 +49,29 @@ class Player(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> 'Player': ...
+    def __getitem__(self, name: typing_extensions.Literal["enemyPlayer"]) -> 'Player': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "enemyPlayer", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 15ae3178b94..d08a18d2ee5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -39,9 +40,8 @@ class Player(
         class properties:
             name = schemas.StrSchema
         
-            @classmethod
-            @property
-            def enemyPlayer(cls) -> typing.Type['Player']:
+            @staticmethod
+            def enemyPlayer() -> typing.Type['Player']:
                 return Player
             __annotations__ = {
                 "name": name,
@@ -49,29 +49,29 @@ class Player(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> 'Player': ...
+    def __getitem__(self, name: typing_extensions.Literal["enemyPlayer"]) -> 'Player': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "enemyPlayer", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py
index a06c3c9303a..6a9b08fa1fd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Quadrilateral(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'quadrilateralType': {
                     'ComplexQuadrilateral': ComplexQuadrilateral,
@@ -45,8 +45,7 @@ class Quadrilateral(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
index a06c3c9303a..6a9b08fa1fd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Quadrilateral(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'quadrilateralType': {
                     'ComplexQuadrilateral': ComplexQuadrilateral,
@@ -45,8 +45,7 @@ class Quadrilateral(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py
index dd045cd155e..a1cf375d2a0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -50,8 +51,7 @@ class QuadrilateralInterface(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def QUADRILATERAL(cls):
                     return cls("Quadrilateral")
             quadrilateralType = schemas.StrSchema
@@ -65,29 +65,29 @@ class QuadrilateralInterface(
     quadrilateralType: MetaOapg.properties.quadrilateralType
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+    def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["shapeType", "quadrilateralType", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index dd045cd155e..a1cf375d2a0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -50,8 +51,7 @@ class QuadrilateralInterface(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def QUADRILATERAL(cls):
                     return cls("Quadrilateral")
             quadrilateralType = schemas.StrSchema
@@ -65,29 +65,29 @@ class QuadrilateralInterface(
     quadrilateralType: MetaOapg.properties.quadrilateralType
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+    def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["shapeType", "quadrilateralType", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index 1fe928ef01a..c849de19067 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,29 +44,29 @@ class ReadOnlyFirst(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+    def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.properties.baz: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", "baz", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index 1fe928ef01a..c849de19067 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,29 +44,29 @@ class ReadOnlyFirst(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+    def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.properties.baz: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["bar", "baz", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py
index 0305d0f9eb3..e08d1d098b9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class ScaleneTriangle(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def SCALENE_TRIANGLE(cls):
                             return cls("ScaleneTriangle")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class ScaleneTriangle(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+            def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class ScaleneTriangle(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 0305d0f9eb3..e08d1d098b9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class ScaleneTriangle(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def SCALENE_TRIANGLE(cls):
                             return cls("ScaleneTriangle")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class ScaleneTriangle(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+            def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["triangleType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class ScaleneTriangle(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py
index d4754b907ad..bab6e983c84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Shape(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'shapeType': {
                     'Quadrilateral': Quadrilateral,
@@ -45,8 +45,7 @@ class Shape(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
index d4754b907ad..bab6e983c84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Shape(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'shapeType': {
                     'Quadrilateral': Quadrilateral,
@@ -45,8 +45,7 @@ class Shape(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py
index f3a7195c0b0..10342b8d037 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +37,8 @@ class ShapeOrNull(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'shapeType': {
                     'Quadrilateral': Quadrilateral,
@@ -48,8 +48,7 @@ class ShapeOrNull(
         one_of_0 = schemas.NoneSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
index f3a7195c0b0..10342b8d037 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,9 +37,8 @@ class ShapeOrNull(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'shapeType': {
                     'Quadrilateral': Quadrilateral,
@@ -48,8 +48,7 @@ class ShapeOrNull(
         one_of_0 = schemas.NoneSchema
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py
index 2876821d241..6490d3a5723 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class SimpleQuadrilateral(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def SIMPLE_QUADRILATERAL(cls):
                             return cls("SimpleQuadrilateral")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class SimpleQuadrilateral(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+            def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class SimpleQuadrilateral(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index 2876821d241..6490d3a5723 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -54,8 +55,7 @@ class SimpleQuadrilateral(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def SIMPLE_QUADRILATERAL(cls):
                             return cls("SimpleQuadrilateral")
                     __annotations__ = {
@@ -63,23 +63,23 @@ class SimpleQuadrilateral(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+            def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
             
-            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def __getitem__(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
             
             @typing.overload
-            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
             @typing.overload
             def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+            def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["quadrilateralType", ], str]):
                 return super().get_item_oapg(name)
             
         
@@ -99,8 +99,7 @@ class SimpleQuadrilateral(
                 )
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py
index ed705b3cb90..3ce8eab0b42 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class SomeObject(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
index ed705b3cb90..3ce8eab0b42 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,8 +36,7 @@ class SomeObject(
     class MetaOapg:
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 824466a0f84..ca1f5c6ab84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,23 +44,23 @@ class SpecialModelName(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> MetaOapg.properties.a: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.properties.a: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 824466a0f84..ca1f5c6ab84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,23 +44,23 @@ class SpecialModelName(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> MetaOapg.properties.a: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.properties.a: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["a", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py
index c2365d1ed9e..9e0907b4269 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.pyi
index c2365d1ed9e..9e0907b4269 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
index 1bc5f574999..9d4a6136b55 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
index 1bc5f574999..9d4a6136b55 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py
index 2667afb8f87..94ee17b59af 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45,38 +46,31 @@ class StringEnum(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def NONE(cls):
         return cls(None)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def PLACED(cls):
         return cls("placed")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def APPROVED(cls):
         return cls("approved")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def DELIVERED(cls):
         return cls("delivered")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def SINGLE_QUOTED(cls):
         return cls("single quoted")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def MULTIPLE_LINES(cls):
         return cls("multiple\nlines")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def DOUBLE_QUOTE_WITH_NEWLINE(cls):
         return cls("double quote \n with newline")
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.pyi
index 2667afb8f87..94ee17b59af 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45,38 +46,31 @@ class StringEnum(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def NONE(cls):
         return cls(None)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def PLACED(cls):
         return cls("placed")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def APPROVED(cls):
         return cls("approved")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def DELIVERED(cls):
         return cls("delivered")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def SINGLE_QUOTED(cls):
         return cls("single quoted")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def MULTIPLE_LINES(cls):
         return cls("multiple\nlines")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def DOUBLE_QUOTE_WITH_NEWLINE(cls):
         return cls("double quote \n with newline")
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py
index b04d5e7c4d3..33976873a61 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class StringEnumWithDefaultValue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def PLACED(cls):
         return cls("placed")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def APPROVED(cls):
         return cls("approved")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def DELIVERED(cls):
         return cls("delivered")
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.pyi
index b04d5e7c4d3..33976873a61 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum_with_default_value.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,17 +39,14 @@ class StringEnumWithDefaultValue(
     Do not edit the class manually.
     """
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def PLACED(cls):
         return cls("placed")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def APPROVED(cls):
         return cls("approved")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def DELIVERED(cls):
         return cls("delivered")
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py
index 52a462b836c..61ff6fcc31d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.pyi
index d9b5a0a4346..df0be025130 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_with_validation.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index 508e8377740..a0176eead36 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,29 +44,29 @@ class Tag(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "name", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id", "name", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index 508e8377740..a0176eead36 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -43,29 +44,29 @@ class Tag(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "name", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id", "name", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py
index affe894c342..0701b6d5111 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Triangle(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'triangleType': {
                     'EquilateralTriangle': EquilateralTriangle,
@@ -46,8 +46,7 @@ class Triangle(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
index affe894c342..0701b6d5111 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -34,9 +35,8 @@ class Triangle(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def discriminator(cls):
+        @staticmethod
+        def discriminator():
             return {
                 'triangleType': {
                     'EquilateralTriangle': EquilateralTriangle,
@@ -46,8 +46,7 @@ class Triangle(
             }
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def one_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py
index a6465b61ad0..6653983329a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -50,8 +51,7 @@ class TriangleInterface(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def TRIANGLE(cls):
                     return cls("Triangle")
             triangleType = schemas.StrSchema
@@ -65,29 +65,29 @@ class TriangleInterface(
     triangleType: MetaOapg.properties.triangleType
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+    def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["shapeType", "triangleType", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index a6465b61ad0..6653983329a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -50,8 +51,7 @@ class TriangleInterface(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def TRIANGLE(cls):
                     return cls("Triangle")
             triangleType = schemas.StrSchema
@@ -65,29 +65,29 @@ class TriangleInterface(
     triangleType: MetaOapg.properties.triangleType
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+    def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["shapeType", "triangleType", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py
index a72414ff28b..c8beb19d825 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -108,95 +109,95 @@ class User(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["username"]) -> MetaOapg.properties.username: ...
+    def __getitem__(self, name: typing_extensions.Literal["username"]) -> MetaOapg.properties.username: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["firstName"]) -> MetaOapg.properties.firstName: ...
+    def __getitem__(self, name: typing_extensions.Literal["firstName"]) -> MetaOapg.properties.firstName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lastName"]) -> MetaOapg.properties.lastName: ...
+    def __getitem__(self, name: typing_extensions.Literal["lastName"]) -> MetaOapg.properties.lastName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["email"]) -> MetaOapg.properties.email: ...
+    def __getitem__(self, name: typing_extensions.Literal["email"]) -> MetaOapg.properties.email: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["phone"]) -> MetaOapg.properties.phone: ...
+    def __getitem__(self, name: typing_extensions.Literal["phone"]) -> MetaOapg.properties.phone: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["userStatus"]) -> MetaOapg.properties.userStatus: ...
+    def __getitem__(self, name: typing_extensions.Literal["userStatus"]) -> MetaOapg.properties.userStatus: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.properties.objectWithNoDeclaredProps: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.properties.objectWithNoDeclaredProps: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.properties.objectWithNoDeclaredPropsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.properties.objectWithNoDeclaredPropsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeProp"]) -> MetaOapg.properties.anyTypeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeProp"]) -> MetaOapg.properties.anyTypeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeExceptNullProp"]) -> MetaOapg.properties.anyTypeExceptNullProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> MetaOapg.properties.anyTypeExceptNullProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> MetaOapg.properties.anyTypePropNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> MetaOapg.properties.anyTypePropNullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index a72414ff28b..c8beb19d825 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -108,95 +109,95 @@ class User(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["username"]) -> MetaOapg.properties.username: ...
+    def __getitem__(self, name: typing_extensions.Literal["username"]) -> MetaOapg.properties.username: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["firstName"]) -> MetaOapg.properties.firstName: ...
+    def __getitem__(self, name: typing_extensions.Literal["firstName"]) -> MetaOapg.properties.firstName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lastName"]) -> MetaOapg.properties.lastName: ...
+    def __getitem__(self, name: typing_extensions.Literal["lastName"]) -> MetaOapg.properties.lastName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["email"]) -> MetaOapg.properties.email: ...
+    def __getitem__(self, name: typing_extensions.Literal["email"]) -> MetaOapg.properties.email: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["phone"]) -> MetaOapg.properties.phone: ...
+    def __getitem__(self, name: typing_extensions.Literal["phone"]) -> MetaOapg.properties.phone: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["userStatus"]) -> MetaOapg.properties.userStatus: ...
+    def __getitem__(self, name: typing_extensions.Literal["userStatus"]) -> MetaOapg.properties.userStatus: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.properties.objectWithNoDeclaredProps: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.properties.objectWithNoDeclaredProps: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.properties.objectWithNoDeclaredPropsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.properties.objectWithNoDeclaredPropsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeProp"]) -> MetaOapg.properties.anyTypeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeProp"]) -> MetaOapg.properties.anyTypeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeExceptNullProp"]) -> MetaOapg.properties.anyTypeExceptNullProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> MetaOapg.properties.anyTypeExceptNullProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> MetaOapg.properties.anyTypePropNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> MetaOapg.properties.anyTypePropNullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.py
index 45f0a63640b..106a9f3cd59 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.pyi
index 4086c73afd4..80495060cf8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/uuid_string.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py
index 48783bcd351..d470f2901a8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class Whale(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def WHALE(cls):
                     return cls("whale")
             hasBaleen = schemas.BoolSchema
@@ -64,35 +64,35 @@ class Whale(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasBaleen"]) -> MetaOapg.properties.hasBaleen: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasBaleen"]) -> MetaOapg.properties.hasBaleen: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasTeeth"]) -> MetaOapg.properties.hasTeeth: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasTeeth"]) -> MetaOapg.properties.hasTeeth: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index 48783bcd351..d470f2901a8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class Whale(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def WHALE(cls):
                     return cls("whale")
             hasBaleen = schemas.BoolSchema
@@ -64,35 +64,35 @@ class Whale(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasBaleen"]) -> MetaOapg.properties.hasBaleen: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasBaleen"]) -> MetaOapg.properties.hasBaleen: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasTeeth"]) -> MetaOapg.properties.hasTeeth: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasTeeth"]) -> MetaOapg.properties.hasTeeth: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py
index 93ef7ba73ed..1cf74de59e9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class Zebra(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def ZEBRA(cls):
                     return cls("zebra")
             
@@ -66,18 +66,15 @@ class Zebra(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def PLAINS(cls):
                     return cls("plains")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def MOUNTAIN(cls):
                     return cls("mountain")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def GREVYS(cls):
                     return cls("grevys")
             __annotations__ = {
@@ -89,28 +86,28 @@ class Zebra(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> MetaOapg.additional_properties: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className"], typing_extensions.Literal["type"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className"], typing_extensions.Literal["type"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
index 93ef7ba73ed..1cf74de59e9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
@@ -15,6 +15,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,8 +50,7 @@ class Zebra(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def ZEBRA(cls):
                     return cls("zebra")
             
@@ -66,18 +66,15 @@ class Zebra(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def PLAINS(cls):
                     return cls("plains")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def MOUNTAIN(cls):
                     return cls("mountain")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def GREVYS(cls):
                     return cls("grevys")
             __annotations__ = {
@@ -89,28 +86,28 @@ class Zebra(
     className: MetaOapg.properties.className
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> MetaOapg.additional_properties: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["className"], typing_extensions.Literal["type"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["className"], typing_extensions.Literal["type"], str, ]):
         return super().get_item_oapg(name)
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.py
index 9460129eafb..800c45e3ca9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.pyi
index 28529114673..dc0216a43f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/another_fake_dummy/patch.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/delete.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/delete.py
similarity index 96%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/delete.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/delete.py
index 3ef10fb3017..1d7550bf636 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/delete.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/delete.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -30,14 +32,14 @@ RequiredStringGroupSchema = schemas.IntSchema
 RequiredInt64GroupSchema = schemas.Int64Schema
 StringGroupSchema = schemas.IntSchema
 Int64GroupSchema = schemas.Int64Schema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'required_string_group': typing.Union[RequiredStringGroupSchema, decimal.Decimal, int, ],
         'required_int64_group': typing.Union[RequiredInt64GroupSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         'string_group': typing.Union[StringGroupSchema, decimal.Decimal, int, ],
@@ -80,13 +82,13 @@ request_query_int64_group = api_client.QueryParameter(
 # header params
 RequiredBooleanGroupSchema = schemas.BoolSchema
 BooleanGroupSchema = schemas.BoolSchema
-RequestRequiredHeaderParams = typing.TypedDict(
+RequestRequiredHeaderParams = typing_extensions.TypedDict(
     'RequestRequiredHeaderParams',
     {
         'required_boolean_group': typing.Union[RequiredBooleanGroupSchema, bool, ],
     }
 )
-RequestOptionalHeaderParams = typing.TypedDict(
+RequestOptionalHeaderParams = typing_extensions.TypedDict(
     'RequestOptionalHeaderParams',
     {
         'boolean_group': typing.Union[BooleanGroupSchema, bool, ],
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/delete.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/delete.pyi
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/delete.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/delete.pyi
index 64edfd2d7f0..7c79e3509df 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/delete.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/delete.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/get.py
similarity index 90%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/get.py
index 0aaa37a01f4..6c9c94cccfd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,13 +48,11 @@ class EnumQueryStringArraySchema(
             schemas.StrSchema
         ):
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def GREATER_THAN(cls):
                 return cls(">")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def DOLLAR(cls):
                 return cls("$")
 
@@ -82,18 +82,15 @@ class EnumQueryStringSchema(
     schemas.StrSchema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def _ABC(cls):
         return cls("_abc")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EFG(cls):
         return cls("-efg")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def XYZ(cls):
         return cls("(xyz)")
 
@@ -108,13 +105,11 @@ class EnumQueryIntegerSchema(
     schemas.Int32Schema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def NEGATIVE_2(cls):
         return cls(-2)
 
@@ -129,21 +124,19 @@ class EnumQueryDoubleSchema(
     schemas.Float64Schema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1_PT_1(cls):
         return cls(1.1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def NEGATIVE_1_PT_2(cls):
         return cls(-1.2)
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         'enum_query_string_array': typing.Union[EnumQueryStringArraySchema, list, tuple, ],
@@ -204,13 +197,11 @@ class EnumHeaderStringArraySchema(
             schemas.StrSchema
         ):
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def GREATER_THAN(cls):
                 return cls(">")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def DOLLAR(cls):
                 return cls("$")
 
@@ -240,26 +231,23 @@ class EnumHeaderStringSchema(
     schemas.StrSchema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def _ABC(cls):
         return cls("_abc")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EFG(cls):
         return cls("-efg")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def XYZ(cls):
         return cls("(xyz)")
-RequestRequiredHeaderParams = typing.TypedDict(
+RequestRequiredHeaderParams = typing_extensions.TypedDict(
     'RequestRequiredHeaderParams',
     {
     }
 )
-RequestOptionalHeaderParams = typing.TypedDict(
+RequestOptionalHeaderParams = typing_extensions.TypedDict(
     'RequestOptionalHeaderParams',
     {
         'enum_header_string_array': typing.Union[EnumHeaderStringArraySchema, list, tuple, ],
@@ -314,13 +302,11 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def GREATER_THAN(cls):
                             return cls(">")
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def DOLLAR(cls):
                             return cls("$")
             
@@ -350,18 +336,15 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def _ABC(cls):
                     return cls("_abc")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def EFG(cls):
                     return cls("-efg")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def XYZ(cls):
                     return cls("(xyz)")
             __annotations__ = {
@@ -370,29 +353,29 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string"]) -> MetaOapg.properties.enum_form_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string"]) -> MetaOapg.properties.enum_form_string: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["enum_form_string_array", "enum_form_string", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/get.pyi
similarity index 89%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/get.pyi
index adce8870c75..b6ceae7b8ef 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,13 +46,11 @@ class EnumQueryStringArraySchema(
             schemas.StrSchema
         ):
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def GREATER_THAN(cls):
                 return cls(">")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def DOLLAR(cls):
                 return cls("$")
 
@@ -80,18 +80,15 @@ class EnumQueryStringSchema(
     schemas.StrSchema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def _ABC(cls):
         return cls("_abc")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EFG(cls):
         return cls("-efg")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def XYZ(cls):
         return cls("(xyz)")
 
@@ -106,13 +103,11 @@ class EnumQueryIntegerSchema(
     schemas.Int32Schema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1(cls):
         return cls(1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def NEGATIVE_2(cls):
         return cls(-2)
 
@@ -127,13 +122,11 @@ class EnumQueryDoubleSchema(
     schemas.Float64Schema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def POSITIVE_1_PT_1(cls):
         return cls(1.1)
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def NEGATIVE_1_PT_2(cls):
         return cls(-1.2)
 # header params
@@ -157,13 +150,11 @@ class EnumHeaderStringArraySchema(
             schemas.StrSchema
         ):
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def GREATER_THAN(cls):
                 return cls(">")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def DOLLAR(cls):
                 return cls("$")
 
@@ -193,18 +184,15 @@ class EnumHeaderStringSchema(
     schemas.StrSchema
 ):
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def _ABC(cls):
         return cls("_abc")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def EFG(cls):
         return cls("-efg")
     
-    @classmethod
-    @property
+    @schemas.classproperty
     def XYZ(cls):
         return cls("(xyz)")
 # body param
@@ -238,13 +226,11 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                         schemas.StrSchema
                     ):
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def GREATER_THAN(cls):
                             return cls(">")
                         
-                        @classmethod
-                        @property
+                        @schemas.classproperty
                         def DOLLAR(cls):
                             return cls("$")
             
@@ -274,18 +260,15 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 schemas.StrSchema
             ):
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def _ABC(cls):
                     return cls("_abc")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def EFG(cls):
                     return cls("-efg")
                 
-                @classmethod
-                @property
+                @schemas.classproperty
                 def XYZ(cls):
                     return cls("(xyz)")
             __annotations__ = {
@@ -294,29 +277,29 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string"]) -> MetaOapg.properties.enum_form_string: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string"]) -> MetaOapg.properties.enum_form_string: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["enum_form_string_array", "enum_form_string", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.py
index 166fdf2737a..cb0a1d3c5aa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.pyi
index 4e18bd5d59a..9513e0bc08d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/patch.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/post.py
similarity index 75%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/post.py
index 88f630abbe2..54172de750c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -155,101 +157,101 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     double: MetaOapg.properties.double
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["callback"]) -> MetaOapg.properties.callback: ...
+    def __getitem__(self, name: typing_extensions.Literal["callback"]) -> MetaOapg.properties.callback: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/post.pyi
similarity index 72%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/post.pyi
index 254c4087e58..e6ee494da3e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -117,101 +119,101 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     double: MetaOapg.properties.double
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["callback"]) -> MetaOapg.properties.callback: ...
+    def __getitem__(self, name: typing_extensions.Literal["callback"]) -> MetaOapg.properties.callback: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/__init__.py
deleted file mode 100644
index 436c489b43e..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.fake_1 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.FAKE
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/__init__.py
deleted file mode 100644
index efc7fd88d81..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.fake_2 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.FAKE
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/__init__.py
deleted file mode 100644
index d0c92cd6fdc..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_3/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.fake_3 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.FAKE
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.py
index 9fee31b8f1b..c1ee6c01440 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.pyi
index c563c0ab2e2..297cb4db509 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_additional_properties_with_array_of_enums/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.py
index 62f2642c198..c6174989d12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.pyi
index 28faa57496e..d5f6d24f0a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_file_schema/put.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.py
index 6aee90ea3a6..3f34b578247 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29,13 +31,13 @@ from . import path
 
 # query params
 QuerySchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'query': typing.Union[QuerySchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.pyi
index a1d3d44816e..43c58164943 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_body_with_query_params/put.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.py
index af729e95194..1ecaf9befac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28,7 +30,7 @@ from . import path
 SomeVarSchema = schemas.StrSchema
 SomeVarSchema = schemas.StrSchema
 SomeVarSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'someVar': typing.Union[SomeVarSchema, str, ],
@@ -36,7 +38,7 @@ RequestRequiredQueryParams = typing.TypedDict(
         'some_var': typing.Union[SomeVarSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.pyi
index fd6235f8a39..b11af7bfdd1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_case_sensitive_params/put.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.py
index d50cecf0353..adec01e9aec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.pyi
index dd7a0e087ab..8381fa1a81c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_classname_test/patch.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.py
index 6eda6ff730b..3cc5cf64c1b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -26,13 +28,13 @@ from . import path
 
 # path params
 IdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'id': typing.Union[IdSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.pyi
index a22dfd6ae8b..d7522ad66fb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_delete_coffee_id/delete.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.py
index 35053222c6e..956d347dbd5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.pyi
index 51d19237fa6..3ba8d20c2a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_health/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
index dec8f7350f2..e09fc626a53 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
index 52811878342..9312b60c9d8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py
index 3510a42cdc3..43c746f71e0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -45,8 +47,7 @@ class CompositionAtRootSchema(
                 min_length = 1
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -101,8 +102,7 @@ class CompositionInPropertySchema(
                             min_length = 1
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -133,23 +133,23 @@ class CompositionInPropertySchema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
@@ -167,12 +167,12 @@ class CompositionInPropertySchema(
             _configuration=_configuration,
             **kwargs,
         )
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         'compositionAtRoot': typing.Union[CompositionAtRootSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
@@ -218,8 +218,7 @@ class SchemaForRequestBodyApplicationJson(
                 min_length = 1
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -274,8 +273,7 @@ class SchemaForRequestBodyMultipartFormData(
                             min_length = 1
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -306,23 +304,23 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
@@ -369,8 +367,7 @@ class SchemaFor200ResponseBodyApplicationJson(
                 min_length = 1
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -425,8 +422,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
                             min_length = 1
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -457,23 +453,23 @@ class SchemaFor200ResponseBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 6c58553a404..ef77ebb2458 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -40,8 +42,7 @@ class CompositionAtRootSchema(
             pass
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -93,8 +94,7 @@ class CompositionInPropertySchema(
                         pass
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -125,23 +125,23 @@ class CompositionInPropertySchema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
@@ -176,8 +176,7 @@ class SchemaForRequestBodyApplicationJson(
             pass
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -229,8 +228,7 @@ class SchemaForRequestBodyMultipartFormData(
                         pass
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -261,23 +259,23 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
@@ -311,8 +309,7 @@ class SchemaFor200ResponseBodyApplicationJson(
             pass
         
         @classmethod
-        @property
-        @functools.cache
+        @functools.lru_cache()
         def all_of(cls):
             # we need this here to make our import statements work
             # we must store _composed_schemas in here so the code is only run
@@ -364,8 +361,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
                         pass
                     
                     @classmethod
-                    @property
-                    @functools.cache
+                    @functools.lru_cache()
                     def all_of(cls):
                         # we need this here to make our import statements work
                         # we must store _composed_schemas in here so the code is only run
@@ -396,23 +392,23 @@ class SchemaFor200ResponseBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["someProp", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index 283cc5cf178..69d6a915813 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,29 +53,29 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     param2: MetaOapg.properties.param2
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["param"]) -> MetaOapg.properties.param: ...
+    def __getitem__(self, name: typing_extensions.Literal["param"]) -> MetaOapg.properties.param: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
+    def __getitem__(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["param"]) -> MetaOapg.properties.param: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["param"]) -> MetaOapg.properties.param: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["param", "param2", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 1bbde21cfd2..71c3412515e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,29 +51,29 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     param2: MetaOapg.properties.param2
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["param"]) -> MetaOapg.properties.param: ...
+    def __getitem__(self, name: typing_extensions.Literal["param"]) -> MetaOapg.properties.param: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
+    def __getitem__(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["param"]) -> MetaOapg.properties.param: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["param"]) -> MetaOapg.properties.param: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["param", "param2", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.py
index e09d0a145dc..00b8cf45421 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.pyi
index 046608cd626..65d08b9962d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_patch/patch.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.py
index 478b441a51a..9f003807d23 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.pyi
index 463facbd750..a2700e06277 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_with_charset/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index eeae1e9e216..36d5018988b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -41,23 +43,23 @@ class MapBeanSchema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
+    def __getitem__(self, name: typing_extensions.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["keyword", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["keyword", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["keyword", ], str]):
         return super().get_item_oapg(name)
     
 
@@ -75,12 +77,12 @@ class MapBeanSchema(
             _configuration=_configuration,
             **kwargs,
         )
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         'mapBean': typing.Union[MapBeanSchema, dict, frozendict.frozendict, ],
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index f51bb30f541..3933c00010d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -39,23 +41,23 @@ class MapBeanSchema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
+    def __getitem__(self, name: typing_extensions.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["keyword", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["keyword", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["keyword", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.py
index 7bebd0c9014..c0c42ad3372 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -31,12 +33,12 @@ ABSchema = schemas.StrSchema
 AbSchema = schemas.StrSchema
 ModelSelfSchema = schemas.StrSchema
 ABSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         '1': typing.Union[Model1Schema, str, ],
@@ -88,12 +90,12 @@ Model1Schema = schemas.StrSchema
 ABSchema = schemas.StrSchema
 ModelSelfSchema = schemas.StrSchema
 ABSchema = schemas.StrSchema
-RequestRequiredHeaderParams = typing.TypedDict(
+RequestRequiredHeaderParams = typing_extensions.TypedDict(
     'RequestRequiredHeaderParams',
     {
     }
 )
-RequestOptionalHeaderParams = typing.TypedDict(
+RequestOptionalHeaderParams = typing_extensions.TypedDict(
     'RequestOptionalHeaderParams',
     {
         '1': typing.Union[Model1Schema, str, ],
@@ -135,7 +137,7 @@ ABSchema = schemas.StrSchema
 AbSchema = schemas.StrSchema
 ModelSelfSchema = schemas.StrSchema
 ABSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         '1': typing.Union[Model1Schema, str, ],
@@ -145,7 +147,7 @@ RequestRequiredPathParams = typing.TypedDict(
         'A-B': typing.Union[ABSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
@@ -193,12 +195,12 @@ ABSchema = schemas.StrSchema
 AbSchema = schemas.StrSchema
 ModelSelfSchema = schemas.StrSchema
 ABSchema = schemas.StrSchema
-RequestRequiredCookieParams = typing.TypedDict(
+RequestRequiredCookieParams = typing_extensions.TypedDict(
     'RequestRequiredCookieParams',
     {
     }
 )
-RequestOptionalCookieParams = typing.TypedDict(
+RequestOptionalCookieParams = typing_extensions.TypedDict(
     'RequestOptionalCookieParams',
     {
         '1': typing.Union[Model1Schema, str, ],
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.pyi
index 01a29e9256b..f87b6b9b1d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_parameter_collisions_1_a_b_ab_self_a_b_/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py
index 7cffcf61079..ef60c3b93d8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29,13 +31,13 @@ from . import path
 
 # path params
 PetIdSchema = schemas.Int64Schema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'petId': typing.Union[PetIdSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
@@ -77,29 +79,29 @@ class SchemaForRequestBodyMultipartFormData(
     requiredFile: MetaOapg.properties.requiredFile
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
+    def __getitem__(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "requiredFile", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index 7a9677c5187..e9c08258020 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,29 +53,29 @@ class SchemaForRequestBodyMultipartFormData(
     requiredFile: MetaOapg.properties.requiredFile
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
+    def __getitem__(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "requiredFile", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.py
index b153cf93b72..ae601b1781d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28,12 +30,12 @@ from . import path
 
 # query params
 MapBeanSchema = Foo
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
         'mapBean': typing.Union[MapBeanSchema, ],
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.pyi
index 3974397cc85..272d34c102d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_ref_obj_in_query/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.py
index d0cf56811d6..fd14aeb19c8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.pyi
index 9d0a50a15af..f0a68485d92 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_array_of_enums/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.py
index 4a31814b9ae..69be2acbc86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.pyi
index c4cc3515038..c0efa3e3939 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_arraymodel/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.py
index 8dedf7b3711..4341a21a723 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.pyi
index 713ad4c77ed..bb75c710c6a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_boolean/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.py
index ab801aee417..8a5362d3cfd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.pyi
index a41aecfb7b7..fd0f12aec0c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.py
index 22c021a3323..e7ea25ea04c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.pyi
index b624784aee8..29291eef290 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_enum/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.py
index b2624ccbbaa..4154902886e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.pyi
index e5bb6dfa290..41062d497f6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_mammal/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.py
index 60a98407a4d..4ff581fd00e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.pyi
index e2d8348634d..57041801964 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_number/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.py
index 70026afb368..bff2bd9a949 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.pyi
index b95948c276d..e48de2e5165 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_object_model_with_ref_props/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.py
index 14856285c0d..6e990df9cda 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.pyi
index d2f1081e1c1..422e8d0829e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_refs_string/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.py
index d6be002e6e3..cfa2be9bece 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.pyi
index 4b74e557567..827291c6f8a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_response_without_schema/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py
index 74896bc5ca8..af5cb28dd15 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -143,7 +145,7 @@ class ContextSchema(
     def __getitem__(self, i: int) -> MetaOapg.items:
         return super().__getitem__(i)
 RefParamSchema = StringWithValidation
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'pipe': typing.Union[PipeSchema, list, tuple, ],
@@ -154,7 +156,7 @@ RequestRequiredQueryParams = typing.TypedDict(
         'refParam': typing.Union[RefParamSchema, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.pyi
index c750ad375c7..9b7dee9311d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.py
index 697f1b79038..c705235d88b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.pyi
index fe2e0f0664f..f7825657cdc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_download_file/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py
index e11344e9dbf..90d7d406ebf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,29 +53,29 @@ class SchemaForRequestBodyMultipartFormData(
     file: MetaOapg.properties.file
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index ab1e21c65f9..515aa163476 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,29 +51,29 @@ class SchemaForRequestBodyMultipartFormData(
     file: MetaOapg.properties.file
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py
index 4cf3f106641..561b9840e86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -66,23 +68,23 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["files", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["files", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index eac2bbb44ed..800be99613d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -64,23 +66,23 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["files", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["files", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index 6506bcb6db7..a396adbc027 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,32 +40,31 @@ class SchemaFor0ResponseBodyApplicationJson(
         
         class properties:
         
-            @classmethod
-            @property
-            def string(cls) -> typing.Type['Foo']:
+            @staticmethod
+            def string() -> typing.Type['Foo']:
                 return Foo
             __annotations__ = {
                 "string": string,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> 'Foo': ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> 'Foo': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["string", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["string", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index 0ee92bc160b..4f7e0cd0856 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -36,32 +38,31 @@ class SchemaFor0ResponseBodyApplicationJson(
         
         class properties:
         
-            @classmethod
-            @property
-            def string(cls) -> typing.Type['Foo']:
+            @staticmethod
+            def string() -> typing.Type['Foo']:
                 return Foo
             __annotations__ = {
                 "string": string,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> 'Foo': ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> 'Foo': ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["string", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["string", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.py
index d0dc9009817..d944d243b5b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.pyi
index c086ce607db..efd25a14172 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/put.py
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/put.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/put.py
index fb7f977e55e..8658e89bdc1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/put.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/put.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/put.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/put.pyi
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/put.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/put.pyi
index c308277d8d6..eea41d2ad06 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/put.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet/put.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/__init__.py
deleted file mode 100644
index c0199ca0c2d..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_2/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.pet_2 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.PET
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py
index 31d20798924..3f9a2430f0e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -49,18 +51,15 @@ class StatusSchema(
             schemas.StrSchema
         ):
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def AVAILABLE(cls):
                 return cls("available")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def PENDING(cls):
                 return cls("pending")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def SOLD(cls):
                 return cls("sold")
 
@@ -77,13 +76,13 @@ class StatusSchema(
 
     def __getitem__(self, i: int) -> MetaOapg.items:
         return super().__getitem__(i)
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'status': typing.Union[StatusSchema, list, tuple, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -114,9 +113,8 @@ class SchemaFor200ResponseBodyApplicationXml(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
@@ -141,9 +139,8 @@ class SchemaFor200ResponseBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.pyi
index 6297993908a..77db139f321 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -47,18 +49,15 @@ class StatusSchema(
             schemas.StrSchema
         ):
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def AVAILABLE(cls):
                 return cls("available")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def PENDING(cls):
                 return cls("pending")
             
-            @classmethod
-            @property
+            @schemas.classproperty
             def SOLD(cls):
                 return cls("sold")
 
@@ -84,9 +83,8 @@ class SchemaFor200ResponseBodyApplicationXml(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
@@ -111,9 +109,8 @@ class SchemaFor200ResponseBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py
index 638b6f9f2f4..03b395a6da4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -51,13 +53,13 @@ class TagsSchema(
 
     def __getitem__(self, i: int) -> MetaOapg.items:
         return super().__getitem__(i)
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'tags': typing.Union[TagsSchema, list, tuple, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -88,9 +90,8 @@ class SchemaFor200ResponseBodyApplicationXml(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
@@ -115,9 +116,8 @@ class SchemaFor200ResponseBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.pyi
index 1c95c84496a..a4e2c33e5e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -58,9 +60,8 @@ class SchemaFor200ResponseBodyApplicationXml(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
@@ -85,9 +86,8 @@ class SchemaFor200ResponseBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['Pet']:
+        @staticmethod
+        def items() -> typing.Type['Pet']:
             return Pet
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.py
index d30ae14e43d..83c429bdea4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27,12 +29,12 @@ from . import path
 
 # header params
 ApiKeySchema = schemas.StrSchema
-RequestRequiredHeaderParams = typing.TypedDict(
+RequestRequiredHeaderParams = typing_extensions.TypedDict(
     'RequestRequiredHeaderParams',
     {
     }
 )
-RequestOptionalHeaderParams = typing.TypedDict(
+RequestOptionalHeaderParams = typing_extensions.TypedDict(
     'RequestOptionalHeaderParams',
     {
         'api_key': typing.Union[ApiKeySchema, str, ],
@@ -52,13 +54,13 @@ request_header_api_key = api_client.HeaderParameter(
 )
 # path params
 PetIdSchema = schemas.Int64Schema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'petId': typing.Union[PetIdSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.pyi
index 19aaf8f02ab..821fe2bd79f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/delete.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/get.py
similarity index 97%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/get.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/get.py
index 5187469693b..2309680029b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29,13 +31,13 @@ from . import path
 
 # path params
 PetIdSchema = schemas.Int64Schema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'petId': typing.Union[PetIdSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/get.pyi
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/get.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/get.pyi
index 4812729dbdb..184adb607d2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/post.py
similarity index 90%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/post.py
index 5f8722c7ddb..76250ba9b3e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -27,13 +29,13 @@ from . import path
 
 # path params
 PetIdSchema = schemas.Int64Schema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'petId': typing.Union[PetIdSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
@@ -70,29 +72,29 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "status", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "status", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/post.pyi
similarity index 90%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/post.pyi
index 6ba44f24819..4a1eee42e7f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -44,29 +46,29 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "status", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["name", "status", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/__init__.py
deleted file mode 100644
index e71bd7be712..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_1/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.pet_pet_id_1 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.PET_PET_ID
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/__init__.py
deleted file mode 100644
index 711e6c0d4b3..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.pet_pet_id_3 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.PET_PET_ID
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 373ff78dafb..432d5586069 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29,13 +31,13 @@ from . import path
 
 # path params
 PetIdSchema = schemas.Int64Schema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'petId': typing.Union[PetIdSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
@@ -72,29 +74,29 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 041a327eb6b..08b46e10d87 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -46,29 +48,29 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     
-    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
+    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
     
     @typing.overload
     def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["additionalMetadata", "file", ], str]):
         return super().get_item_oapg(name)
     
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
index 00e0842707f..794c49c9f26 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
index c4ee012ec35..6ace8ae4e50 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.py
index 0d7379e5878..aba51cba12a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.pyi
index 0b2c8ee1846..5a0d7684aa1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.py
index c22620f69a2..05b16de6cb9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -26,13 +28,13 @@ from . import path
 
 # path params
 OrderIdSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'order_id': typing.Union[OrderIdSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.pyi
index a06a0f46598..e4350d629ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/delete.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/get.py
similarity index 97%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/get.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/get.py
index 9d57ad53c48..eed2c94e672 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -38,13 +40,13 @@ class OrderIdSchema(
     class MetaOapg:
         inclusive_maximum = 5
         inclusive_minimum = 1
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'order_id': typing.Union[OrderIdSchema, decimal.Decimal, int, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/get.pyi
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/get.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/get.pyi
index 2e7762d00f3..cf9aca7145c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/__init__.py
deleted file mode 100644
index f376d4ba8da..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_order_order_id_1/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.store_order_order_id_1 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.STORE_ORDER_ORDER_ID
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.py
index 571efcad80d..4dd2c94c164 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.pyi
index 9578881d202..171956cf707 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py
index 3588996c2aa..35e44ef1d46 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +39,8 @@ class SchemaForRequestBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['User']:
+        @staticmethod
+        def items() -> typing.Type['User']:
             return User
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.pyi
index 4cc093a8ada..19037fd1b36 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,9 +37,8 @@ class SchemaForRequestBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['User']:
+        @staticmethod
+        def items() -> typing.Type['User']:
             return User
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py
index 3b6625b0355..491da3305b0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -37,9 +39,8 @@ class SchemaForRequestBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['User']:
+        @staticmethod
+        def items() -> typing.Type['User']:
             return User
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.pyi
index 8cd0b172ea2..2f2321d8504 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -35,9 +37,8 @@ class SchemaForRequestBodyApplicationJson(
 
     class MetaOapg:
         
-        @classmethod
-        @property
-        def items(cls) -> typing.Type['User']:
+        @staticmethod
+        def items() -> typing.Type['User']:
             return User
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.py
index 766e952f13d..0e913fbb36a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -28,14 +30,14 @@ from . import path
 # query params
 UsernameSchema = schemas.StrSchema
 PasswordSchema = schemas.StrSchema
-RequestRequiredQueryParams = typing.TypedDict(
+RequestRequiredQueryParams = typing_extensions.TypedDict(
     'RequestRequiredQueryParams',
     {
         'username': typing.Union[UsernameSchema, str, ],
         'password': typing.Union[PasswordSchema, str, ],
     }
 )
-RequestOptionalQueryParams = typing.TypedDict(
+RequestOptionalQueryParams = typing_extensions.TypedDict(
     'RequestOptionalQueryParams',
     {
     },
@@ -75,7 +77,7 @@ x_expires_after_parameter = api_client.HeaderParameter(
 )
 SchemaFor200ResponseBodyApplicationXml = schemas.StrSchema
 SchemaFor200ResponseBodyApplicationJson = schemas.StrSchema
-ResponseHeadersFor200 = typing.TypedDict(
+ResponseHeadersFor200 = typing_extensions.TypedDict(
     'ResponseHeadersFor200',
     {
         'X-Rate-Limit': XRateLimitSchema,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.pyi
index 8db9487c15d..fb90bd6d3ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_login/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.py
index fc6bf8c02d0..e9b8bf377ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.pyi
index 8fed1857081..ba8f80388d7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_logout/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.py
index 2ecb3cbd6d8..c78b157c12a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -26,13 +28,13 @@ from . import path
 
 # path params
 UsernameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'username': typing.Union[UsernameSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.pyi
index a3ae44ebcf7..77a7de83384 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/delete.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 
 from petstore_api import api_client, exceptions
@@ -16,6 +17,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/get.py
similarity index 97%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/get.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/get.py
index 127b6b47d8f..ffb005b23ee 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/get.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29,13 +31,13 @@ from . import path
 
 # path params
 UsernameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'username': typing.Union[UsernameSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/get.pyi
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/get.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/get.pyi
index e65db0985c5..8096176552b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/get.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/put.py
similarity index 97%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/put.py
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/put.py
index ac0bce944a6..b9060cb6e7a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/put.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/put.py
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
@@ -29,13 +31,13 @@ from . import path
 
 # path params
 UsernameSchema = schemas.StrSchema
-RequestRequiredPathParams = typing.TypedDict(
+RequestRequiredPathParams = typing_extensions.TypedDict(
     'RequestRequiredPathParams',
     {
         'username': typing.Union[UsernameSchema, str, ],
     }
 )
-RequestOptionalPathParams = typing.TypedDict(
+RequestOptionalPathParams = typing_extensions.TypedDict(
     'RequestOptionalPathParams',
     {
     },
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/put.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/put.pyi
similarity index 98%
rename from samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/put.pyi
rename to samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/put.pyi
index 5459114d32b..fd208aa8050 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/put.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username/put.pyi
@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 
@@ -17,6 +18,7 @@ import functools  # noqa: F401
 import io  # noqa: F401
 import re  # noqa: F401
 import typing  # noqa: F401
+import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 
 import frozendict  # noqa: F401
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/__init__.py
deleted file mode 100644
index d6f09581ef0..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_1/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.user_username_1 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.USER_USERNAME
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/__init__.py
deleted file mode 100644
index ef8cbb9629e..00000000000
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_username_2/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# do not import all endpoints into this module because that uses a lot of memory and stack frames
-# if you need the ability to import all endpoints from this module, import them with
-# from petstore_api.paths.user_username_2 import Api
-
-from petstore_api.paths import PathValues
-
-path = PathValues.USER_USERNAME
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
index 4e13043fca6..80ee17062a5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -15,6 +15,7 @@ import functools
 import decimal
 import io
 import re
+import types
 import typing
 import uuid
 
@@ -183,9 +184,17 @@ class Singleton:
         return f'<{self.__class__.__name__}: {super().__repr__()}>'
 
 
+class classproperty:
+
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, owner_self, owner_cls):
+        return self.fget(owner_cls)
+
+
 class NoneClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def NONE(cls):
         return cls(None)
 
@@ -194,17 +203,15 @@ class NoneClass(Singleton):
 
 
 class BoolClass(Singleton):
-    @classmethod
-    @property
+    @classproperty
     def TRUE(cls):
         return cls(True)
 
-    @classmethod
-    @property
+    @classproperty
     def FALSE(cls):
         return cls(False)
 
-    @functools.cache
+    @functools.lru_cache()
     def __bool__(self) -> bool:
         for key, instance in self._instances.items():
             if self is instance:
@@ -256,6 +263,16 @@ class Schema:
             return "is {0}".format(all_class_names[0])
         return "is one of [{0}]".format(", ".join(all_class_names))
 
+    @staticmethod
+    def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+        if isinstance(item_cls, types.FunctionType):
+            # referenced schema
+            return item_cls()
+        elif isinstance(item_cls, staticmethod):
+            # referenced schema
+            return item_cls.__func__()
+        return item_cls
+
     @classmethod
     def __type_error_message(
         cls, var_value=None, var_name=None, valid_classes=None, key_type=None
@@ -863,39 +880,19 @@ class ValidatorBase:
         )
 
 
-class Validator(typing.Protocol):
-    @classmethod
-    def _validate_oapg(
-        cls,
-        arg,
-        validation_metadata: ValidationMetadata,
-    ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-        pass
-
-
 class EnumMakerBase:
     pass
 
 
-class EnumMakerInterface(Validator):
-    @classmethod
-    @property
-    def _enum_value_to_name(
-        cls
-    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
-        pass
-
-
-def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
+def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> 'SchemaEnumMaker':
     class SchemaEnumMaker(EnumMakerBase):
         @classmethod
-        @property
         def _enum_value_to_name(
-                cls
+            cls
         ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
             pass
             try:
-                super_enum_value_to_name = super()._enum_value_to_name
+                super_enum_value_to_name = super()._enum_value_to_name()
             except AttributeError:
                 return enum_value_to_name
             intersection = dict(enum_value_to_name.items() & super_enum_value_to_name.items())
@@ -912,9 +909,9 @@ def SchemaEnumMakerClsFactory(enum_value_to_name: typing.Dict[typing.Union[str,
             Validates that arg is in the enum's allowed values
             """
             try:
-                cls._enum_value_to_name[arg]
+                cls._enum_value_to_name()[arg]
             except KeyError:
-                raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name))
+                raise ApiValueError("Invalid value {} passed in to {}, {}".format(arg, cls, cls._enum_value_to_name()))
             return super()._validate_oapg(arg, validation_metadata=validation_metadata)
 
     return SchemaEnumMaker
@@ -1041,7 +1038,7 @@ class StrBase(ValidatorBase):
 
 class UUIDBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_uuid_oapg(self) -> uuid.UUID:
         return uuid.UUID(self)
 
@@ -1107,7 +1104,7 @@ DEFAULT_ISOPARSER = CustomIsoparser()
 
 class DateBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_date_oapg(self) -> date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
@@ -1138,7 +1135,7 @@ class DateBase:
 
 class DateTimeBase:
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_datetime_oapg(self) -> datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
@@ -1175,7 +1172,7 @@ class DecimalBase:
     """
 
     @property
-    @functools.cache
+    @functools.lru_cache()
     def as_decimal_oapg(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
@@ -1344,6 +1341,7 @@ class ListBase(ValidatorBase):
         # if we have definitions for an items schema, use it
         # otherwise accept anything
         item_cls = getattr(cls.MetaOapg, 'items', UnsetAnyTypeSchema)
+        item_cls = cls._get_class_oapg(item_cls)
         path_to_schemas = {}
         for i, value in enumerate(list_items):
             item_validation_metadata = ValidationMetadata(
@@ -1477,7 +1475,7 @@ class Discriminable:
         """
         if not hasattr(cls.MetaOapg, 'discriminator'):
             return None
-        disc = cls.MetaOapg.discriminator
+        disc = cls.MetaOapg.discriminator()
         if disc_property_name not in disc:
             return None
         discriminated_cls = disc[disc_property_name].get(disc_payload_value)
@@ -1492,21 +1490,24 @@ class Discriminable:
         ):
             return None
         # TODO stop traveling if a cycle is hit
-        for allof_cls in getattr(cls.MetaOapg, 'all_of', []):
-            discriminated_cls = allof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for oneof_cls in getattr(cls.MetaOapg, 'one_of', []):
-            discriminated_cls = oneof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
-        for anyof_cls in getattr(cls.MetaOapg, 'any_of', []):
-            discriminated_cls = anyof_cls.get_discriminated_class_oapg(
-                disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
-            if discriminated_cls is not None:
-                return discriminated_cls
+        if hasattr(cls.MetaOapg, 'all_of'):
+            for allof_cls in cls.MetaOapg.all_of():
+                discriminated_cls = allof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'one_of'):
+            for oneof_cls in cls.MetaOapg.one_of():
+                discriminated_cls = oneof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
+        if hasattr(cls.MetaOapg, 'any_of'):
+            for anyof_cls in cls.MetaOapg.any_of():
+                discriminated_cls = anyof_cls.get_discriminated_class_oapg(
+                    disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
+                if discriminated_cls is not None:
+                    return discriminated_cls
         return None
 
 
@@ -1605,9 +1606,7 @@ class DictBase(Discriminable, ValidatorBase):
                 raise ApiTypeError('Unable to find schema for value={} in class={} at path_to_item={}'.format(
                     value, cls, validation_metadata.path_to_item+(property_name,)
                 ))
-            if isinstance(schema, classmethod):
-                # referenced schema, call classmethod property
-                schema = schema.__func__.fget(properties)
+            schema = cls._get_class_oapg(schema)
             arg_validation_metadata = ValidationMetadata(
                 from_server=validation_metadata.from_server,
                 configuration=validation_metadata.configuration,
@@ -1678,7 +1677,7 @@ class DictBase(Discriminable, ValidatorBase):
         other_path_to_schemas = cls.__validate_args(arg, validation_metadata=validation_metadata)
         update(_path_to_schemas, other_path_to_schemas)
         try:
-            discriminator = cls.MetaOapg.discriminator
+            discriminator = cls.MetaOapg.discriminator()
         except AttributeError:
             return _path_to_schemas
         # discriminator exists
@@ -1863,7 +1862,7 @@ class ComposedBase(Discriminable):
     @classmethod
     def __get_allof_classes(cls, arg, validation_metadata: ValidationMetadata):
         path_to_schemas = defaultdict(set)
-        for allof_cls in cls.MetaOapg.all_of:
+        for allof_cls in cls.MetaOapg.all_of():
             if validation_metadata.validation_ran_earlier(allof_cls):
                 continue
             other_path_to_schemas = allof_cls._validate_oapg(arg, validation_metadata=validation_metadata)
@@ -1879,7 +1878,7 @@ class ComposedBase(Discriminable):
     ):
         oneof_classes = []
         path_to_schemas = defaultdict(set)
-        for oneof_cls in cls.MetaOapg.one_of:
+        for oneof_cls in cls.MetaOapg.one_of():
             if oneof_cls in path_to_schemas[validation_metadata.path_to_item]:
                 oneof_classes.append(oneof_cls)
                 continue
@@ -1914,7 +1913,7 @@ class ComposedBase(Discriminable):
     ):
         anyof_classes = []
         path_to_schemas = defaultdict(set)
-        for anyof_cls in cls.MetaOapg.any_of:
+        for anyof_cls in cls.MetaOapg.any_of():
             if validation_metadata.validation_ran_earlier(anyof_cls):
                 anyof_classes.append(anyof_cls)
                 continue
@@ -2004,8 +2003,9 @@ class ComposedBase(Discriminable):
             )
             update(path_to_schemas, other_path_to_schemas)
         not_cls = None
-        if hasattr(cls, 'MetaOapg'):
-            not_cls = getattr(cls.MetaOapg, 'not_schema', None)
+        if hasattr(cls, 'MetaOapg') and hasattr(cls.MetaOapg, 'not_schema'):
+            not_cls = cls.MetaOapg.not_schema
+            not_cls = cls._get_class_oapg(not_cls)
         if not_cls:
             other_path_to_schemas = None
             not_exception = ApiValueError(
@@ -2374,10 +2374,12 @@ class BinarySchema(
     BinaryMixin
 ):
     class MetaOapg:
-        one_of = [
-            BytesSchema,
-            FileSchema,
-        ]
+        @staticmethod
+        def one_of():
+            return [
+                BytesSchema,
+                FileSchema,
+            ]
 
     def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration):
         return super().__new__(cls, arg)
@@ -2456,7 +2458,7 @@ class DictSchema(
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
 
 
-@functools.cache
+@functools.lru_cache()
 def get_new_class(
     class_name: str,
     bases: typing.Tuple[typing.Type[typing.Union[Schema, typing.Any]], ...]
diff --git a/samples/openapi3/client/petstore/python-experimental/setup.py b/samples/openapi3/client/petstore/python-experimental/setup.py
index c0194e51636..2acc6c1cf2b 100644
--- a/samples/openapi3/client/petstore/python-experimental/setup.py
+++ b/samples/openapi3/client/petstore/python-experimental/setup.py
@@ -27,6 +27,7 @@ REQUIRES = [
   "frozendict >= 2.0.3",
   "pem>=19.3.0",
   "pycryptodome>=3.9.0",
+  "typing_extensions",
 ]
 
 setup(
@@ -37,7 +38,7 @@ setup(
     author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"],
-    python_requires=">=3.9",
+    python_requires=">=3.7",
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/__init__.py
index 3d592080805..1309632d3d5 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/__init__.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/__init__.py
@@ -41,7 +41,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -50,7 +50,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_3/test_delete.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_delete.py
similarity index 93%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_3/test_delete.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_delete.py
index 9c8b08305b1..e36d03aabcd 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_3/test_delete.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_delete.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.fake_3 import delete  # noqa: E501
+from petstore_api.paths.fake import delete  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_2/test_get.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_get.py
similarity index 93%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_2/test_get.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_get.py
index ce46c593e4a..f837d7deb2c 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_2/test_get.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_get.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.fake_2 import get  # noqa: E501
+from petstore_api.paths.fake import get  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_1/test_post.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_post.py
similarity index 93%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_1/test_post.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_post.py
index edaf8f65019..ed46831cc90 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_1/test_post.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake/test_post.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.fake_1 import post  # noqa: E501
+from petstore_api.paths.fake import post  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_1/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_2/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_2/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_3/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_fake_3/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_2/test_put.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet/test_put.py
similarity index 93%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_2/test_put.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet/test_put.py
index 24c48f946c6..903536c66d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_2/test_put.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet/test_put.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.pet_2 import put  # noqa: E501
+from petstore_api.paths.pet import put  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_2/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_2/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_1/test_get.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id/test_get.py
similarity index 92%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_1/test_get.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id/test_get.py
index 89b55e31413..78e02c339c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_1/test_get.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id/test_get.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.pet_pet_id_1 import get  # noqa: E501
+from petstore_api.paths.pet_pet_id import get  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_3/test_post.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id/test_post.py
similarity index 92%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_3/test_post.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id/test_post.py
index 539cde9d2c1..6c6c9e60ad3 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_3/test_post.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id/test_post.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.pet_pet_id_3 import post  # noqa: E501
+from petstore_api.paths.pet_pet_id import post  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_1/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_3/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_pet_pet_id_3/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id_1/test_get.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id/test_get.py
similarity index 91%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id_1/test_get.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id/test_get.py
index 221c4c2a83d..55a5443d970 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id_1/test_get.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id/test_get.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.store_order_order_id_1 import get  # noqa: E501
+from petstore_api.paths.store_order_order_id import get  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_store_order_order_id_1/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_1/test_get.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username/test_get.py
similarity index 92%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_1/test_get.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username/test_get.py
index a29f5300157..c56b8bd1e4d 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_1/test_get.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username/test_get.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.user_username_1 import get  # noqa: E501
+from petstore_api.paths.user_username import get  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_2/test_put.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username/test_put.py
similarity index 92%
rename from samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_2/test_put.py
rename to samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username/test_put.py
index b2a47635c24..6e94769a585 100644
--- a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_2/test_put.py
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username/test_put.py
@@ -12,7 +12,7 @@ from unittest.mock import patch
 import urllib3
 
 import petstore_api
-from petstore_api.paths.user_username_2 import put  # noqa: E501
+from petstore_api.paths.user_username import put  # noqa: E501
 from petstore_api import configuration, schemas, api_client
 
 from .. import ApiTestMixin
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_1/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_1/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_2/__init__.py b/samples/openapi3/client/petstore/python-experimental/test/test_paths/test_user_username_2/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/__init__.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/__init__.py
index 104cdf76ff5..30c8b05d3f6 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/__init__.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/__init__.py
@@ -20,7 +20,7 @@ class ApiTestMixin(unittest.TestCase):
         method: str = 'POST',
         body: typing.Optional[bytes] = None,
         content_type: typing.Optional[str] = 'application/json',
-        fields: typing.Optional[tuple[api_client.RequestField, ...]] = None,
+        fields: typing.Optional[typing.Tuple[api_client.RequestField, ...]] = None,
         accept_content_type: typing.Optional[str] = 'application/json',
         stream: bool = False,
     ):
@@ -77,7 +77,7 @@ class ApiTestMixin(unittest.TestCase):
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -86,7 +86,7 @@ class ApiTestMixin(unittest.TestCase):
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_validator.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_validator.py
index 0410365a021..a54404c542a 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_validator.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_validator.py
@@ -30,8 +30,8 @@ class TestAdditionalPropertiesValidator(unittest.TestCase):
         assert add_prop == 'abc'
         assert isinstance(add_prop, str)
         assert isinstance(add_prop, schemas.AnyTypeSchema)
-        assert isinstance(add_prop, AdditionalPropertiesValidator.MetaOapg.all_of[1].MetaOapg.additional_properties)
-        assert isinstance(add_prop, AdditionalPropertiesValidator.MetaOapg.all_of[2].MetaOapg.additional_properties)
+        assert isinstance(add_prop, AdditionalPropertiesValidator.MetaOapg.all_of()[1].MetaOapg.additional_properties)
+        assert isinstance(add_prop, AdditionalPropertiesValidator.MetaOapg.all_of()[2].MetaOapg.additional_properties)
         assert not isinstance(add_prop, schemas.UnsetAnyTypeSchema)
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py
index f67158bca1c..68bb19bd249 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py
@@ -43,7 +43,7 @@ class TestAnimal(unittest.TestCase):
         animal = Animal(className='Cat', color='black')
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Cat)
-        assert isinstance(animal, Cat.MetaOapg.all_of[1])
+        assert isinstance(animal, Cat.MetaOapg.all_of()[1])
         assert isinstance(animal, Animal)
         assert set(animal.keys()) == {'className', 'color'}
         assert animal.className == 'Cat'
@@ -56,7 +56,7 @@ class TestAnimal(unittest.TestCase):
         assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Cat)
-        assert isinstance(animal, Cat.MetaOapg.all_of[1])
+        assert isinstance(animal, Cat.MetaOapg.all_of()[1])
         assert set(animal.keys()) == {'className', 'color', 'declawed'}
         assert animal.className == 'Cat'
         assert animal["color"] == 'black'
@@ -70,7 +70,7 @@ class TestAnimal(unittest.TestCase):
         assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Dog)
-        assert isinstance(animal, Dog.MetaOapg.all_of[1])
+        assert isinstance(animal, Dog.MetaOapg.all_of()[1])
         assert set(animal.keys()) == {'className', 'color'}
         assert animal.className == 'Dog'
         assert animal["color"] == 'black'
@@ -82,7 +82,7 @@ class TestAnimal(unittest.TestCase):
         assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Dog)
-        assert isinstance(animal, Dog.MetaOapg.all_of[1])
+        assert isinstance(animal, Dog.MetaOapg.all_of()[1])
         assert set(animal.keys()) == {'className', 'color', 'breed'}
         assert animal.className == 'Dog'
         assert animal["color"] == 'black'
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_any_type_schema.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_any_type_schema.py
index 160d7835242..15f498bcc0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_any_type_schema.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_any_type_schema.py
@@ -39,10 +39,12 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testDictSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    DictSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        DictSchema,
+                    ]
 
         m = Model(a=1, b='hi')
         assert isinstance(m, Model)
@@ -54,10 +56,12 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testListSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    ListSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        ListSchema,
+                    ]
 
         m = Model([1, 'hi'])
         assert isinstance(m, Model)
@@ -69,10 +73,12 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testStrSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    StrSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        StrSchema,
+                    ]
 
         m = Model('hi')
         assert isinstance(m, Model)
@@ -84,10 +90,12 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testNumberSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    NumberSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        NumberSchema,
+                    ]
 
         m = Model(1)
         assert isinstance(m, Model)
@@ -106,10 +114,12 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testIntSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    IntSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        IntSchema,
+                    ]
 
         m = Model(1)
         assert isinstance(m, Model)
@@ -120,15 +130,17 @@ class TestAnyTypeSchema(unittest.TestCase):
 
         with self.assertRaises(petstore_api.exceptions.ApiValueError):
             # can't pass in float into Int
-            m = Model(3.14)
+            Model(3.14)
 
     def testBoolSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    BoolSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        BoolSchema,
+                    ]
 
         m = Model(True)
         assert isinstance(m, Model)
@@ -147,25 +159,29 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testNoneSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    NoneSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        NoneSchema,
+                    ]
 
         m = Model(None)
+        self.assertTrue(m.is_none_oapg())
         assert isinstance(m, Model)
         assert isinstance(m, AnyTypeSchema)
         assert isinstance(m, NoneSchema)
         assert isinstance(m, NoneClass)
-        self.assertTrue(m.is_none_oapg())
 
     def testDateSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    DateSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        DateSchema,
+                    ]
 
         m = Model('1970-01-01')
         assert isinstance(m, Model)
@@ -177,10 +193,12 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testDateTimeSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    DateTimeSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        DateTimeSchema,
+                    ]
 
         m = Model('2020-01-01T00:00:00')
         assert isinstance(m, Model)
@@ -192,18 +210,20 @@ class TestAnyTypeSchema(unittest.TestCase):
     def testDecimalSchema(self):
         class Model(ComposedSchema):
             class MetaOapg:
-                all_of = [
-                    AnyTypeSchema,
-                    DecimalSchema,
-                ]
+                @staticmethod
+                def all_of():
+                    return [
+                        AnyTypeSchema,
+                        DecimalSchema,
+                    ]
 
         m = Model('12.34')
+        assert m == '12.34'
+        assert m.as_decimal_oapg == Decimal('12.34')
         assert isinstance(m, Model)
         assert isinstance(m, AnyTypeSchema)
         assert isinstance(m, DecimalSchema)
         assert isinstance(m, str)
-        assert m == '12.34'
-        assert m.as_decimal_oapg == Decimal('12.34')
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_combine_schemas.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_combine_schemas.py
index 403d9709f82..13e4ba88f9a 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_combine_schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_combine_schemas.py
@@ -32,13 +32,13 @@ class TestCombineNonObjectSchemas(unittest.TestCase):
         class EnumPlusPrim(IntegerMax10, IntegerEnumOneValue):
             pass
 
-        assert EnumPlusPrim._enum_value_to_name == {0: "POSITIVE_0"}
+        assert EnumPlusPrim._enum_value_to_name() == {0: "POSITIVE_0"}
 
         # order of base classes does not matter
         class EnumPlusPrim(IntegerEnumOneValue, IntegerMax10):
             pass
 
-        assert EnumPlusPrim._enum_value_to_name == {0: "POSITIVE_0"}
+        assert EnumPlusPrim._enum_value_to_name() == {0: "POSITIVE_0"}
 
         enum_value = EnumPlusPrim.POSITIVE_0
         assert isinstance(enum_value, EnumPlusPrim)
@@ -62,13 +62,13 @@ class TestCombineNonObjectSchemas(unittest.TestCase):
         class IntegerOneEnum(IntegerEnum, IntegerEnumOneValue):
             pass
 
-        assert IntegerOneEnum._enum_value_to_name == {0: "POSITIVE_0"}
+        assert IntegerOneEnum._enum_value_to_name() == {0: "POSITIVE_0"}
 
         # order of base classes does not matter
         class IntegerOneEnum(IntegerEnumOneValue, IntegerEnum):
             pass
 
-        assert IntegerOneEnum._enum_value_to_name == {0: "POSITIVE_0"}
+        assert IntegerOneEnum._enum_value_to_name() == {0: "POSITIVE_0"}
 
         enum_value = IntegerOneEnum.POSITIVE_0
         assert isinstance(enum_value, IntegerOneEnum)
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
index 813102400cf..6f1a2265553 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
@@ -55,7 +55,7 @@ class TestFruit(unittest.TestCase):
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
-            Fruit.MetaOapg.one_of,
+            Fruit.MetaOapg.one_of(),
             [
                 apple.Apple,
                 banana.Banana,
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
index 2564a57111f..bdabb193648 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
@@ -70,7 +70,7 @@ class TestFruitReq(unittest.TestCase):
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
-            FruitReq.MetaOapg.one_of,
+            FruitReq.MetaOapg.one_of(),
             [
                 schemas.NoneSchema,
                 apple_req.AppleReq,
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
index de79d6488f9..ad650460a4c 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
@@ -70,7 +70,7 @@ class TestGmFruit(unittest.TestCase):
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
-            GmFruit.MetaOapg.any_of,
+            GmFruit.MetaOapg.any_of(),
             [
                 apple.Apple,
                 banana.Banana,
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py
index cd5ded5a673..42fc674cd2d 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py
@@ -29,8 +29,6 @@ class TestObjectModelWithRefProps(unittest.TestCase):
 
     def testObjectModelWithRefProps(self):
         """Test ObjectModelWithRefProps"""
-        self.assertEqual(ObjectModelWithRefProps.MetaOapg.properties.myNumber, NumberWithValidations)
-
         inst = ObjectModelWithRefProps(myNumber=15.0, myString="a", myBoolean=True)
         assert isinstance(inst, ObjectModelWithRefProps)
         assert isinstance(inst, frozendict.frozendict)
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py
index 3ff2273f3a8..4a61f9c7f9e 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_validate.py
@@ -101,7 +101,7 @@ class TestValidateResults(unittest.TestCase):
         for path, schema_classes in path_to_schemas.items():
             Animal._process_schema_classes_oapg(schema_classes)
         assert path_to_schemas == {
-            ("args[0]",): {Animal, Dog, Dog.MetaOapg.all_of[1], frozendict.frozendict},
+            ("args[0]",): {Animal, Dog, Dog.MetaOapg.all_of()[1], frozendict.frozendict},
             ("args[0]", "className"): {StrSchema, str},
             ("args[0]", "color"): {StrSchema, str},
         }
diff --git a/samples/openapi3/client/petstore/python-experimental/tox.ini b/samples/openapi3/client/petstore/python-experimental/tox.ini
index ef7cec358ca..e57c17e10c1 100644
--- a/samples/openapi3/client/petstore/python-experimental/tox.ini
+++ b/samples/openapi3/client/petstore/python-experimental/tox.ini
@@ -1,7 +1,8 @@
 [tox]
-envlist = py39
+envlist = py37
 
 [testenv]
+passenv = PYTHON_VERSION
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt