From 968ed4c3bfbc9a2eb7bffa4236fee65b33e3a1f4 Mon Sep 17 00:00:00 2001
From: Josha91 <joshavanhoudt@gmail.com>
Date: Thu, 11 Jan 2024 20:15:19 +0100
Subject: [PATCH] Remove cached_property backport (#6398)

We require recent-enough Python which has `functools.cached_property`.

Fixes #6395
---
 cirq-core/cirq/_compat.py                      |  6 ------
 cirq-core/cirq/_compat_test.py                 | 18 ------------------
 cirq-core/cirq/circuits/circuit_operation.py   |  3 ++-
 cirq-core/cirq/circuits/frozen_circuit.py      |  5 +++--
 .../superconducting_qubits_noise_properties.py |  5 +++--
 cirq-core/cirq/ops/clifford_gate.py            | 12 ++++++------
 cirq-core/cirq/ops/control_values.py           |  7 ++++---
 cirq-core/cirq/sim/state_vector_simulator.py   |  3 ++-
 cirq-ft/cirq_ft/algos/and_gate.py              |  2 +-
 .../cirq_ft/algos/apply_gate_to_lth_target.py  |  2 +-
 cirq-ft/cirq_ft/algos/arithmetic_gates.py      |  2 +-
 cirq-ft/cirq_ft/algos/generic_select.py        |  2 +-
 cirq-ft/cirq_ft/algos/hubbard_model.py         |  2 +-
 .../mean_estimation/complex_phase_oracle.py    |  2 +-
 .../complex_phase_oracle_test.py               |  2 +-
 .../mean_estimation_operator.py                |  2 +-
 .../mean_estimation_operator_test.py           |  2 +-
 .../algos/multi_control_multi_target_pauli.py  |  2 +-
 .../algos/prepare_uniform_superposition.py     |  2 +-
 .../algos/programmable_rotation_gate_array.py  |  3 ++-
 .../programmable_rotation_gate_array_test.py   |  2 +-
 cirq-ft/cirq_ft/algos/qrom.py                  |  2 +-
 .../algos/qubitization_walk_operator.py        |  2 +-
 .../cirq_ft/algos/reflection_using_prepare.py  |  2 +-
 cirq-ft/cirq_ft/algos/select_and_prepare.py    |  2 +-
 cirq-ft/cirq_ft/algos/select_swap_qrom.py      |  2 +-
 .../cirq_ft/algos/selected_majorana_fermion.py |  2 +-
 cirq-ft/cirq_ft/algos/state_preparation.py     |  2 +-
 cirq-ft/cirq_ft/algos/swap_network.py          |  2 +-
 cirq-ft/cirq_ft/algos/unary_iteration.ipynb    |  6 +++---
 cirq-ft/cirq_ft/algos/unary_iteration_gate.py  |  2 +-
 .../cirq_ft/algos/unary_iteration_gate_test.py |  2 +-
 cirq-ft/cirq_ft/infra/testing.py               |  2 +-
 .../devices/google_noise_properties.py         |  5 +++--
 .../cirq_google/engine/engine_client.py        |  2 +-
 35 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/cirq-core/cirq/_compat.py b/cirq-core/cirq/_compat.py
index e3c527642bd..9792d5845d3 100644
--- a/cirq-core/cirq/_compat.py
+++ b/cirq-core/cirq/_compat.py
@@ -61,12 +61,6 @@ def with_debug(value: bool) -> Iterator[None]:
         __cirq_debug__.reset(token)
 
 
-try:
-    from functools import cached_property  # pylint: disable=unused-import
-except ImportError:
-    from backports.cached_property import cached_property  # type: ignore[no-redef]
-
-
 # Sentinel used by wrapped_no_args below when method has not yet been cached.
 _NOT_FOUND = object()
 
diff --git a/cirq-core/cirq/_compat_test.py b/cirq-core/cirq/_compat_test.py
index ac9762ec83f..4951011d04c 100644
--- a/cirq-core/cirq/_compat_test.py
+++ b/cirq-core/cirq/_compat_test.py
@@ -38,7 +38,6 @@
 from cirq._compat import (
     block_overlapping_deprecation,
     cached_method,
-    cached_property,
     proper_repr,
     dataclass_repr,
     deprecated,
@@ -1011,23 +1010,6 @@ def f(x):
         f(5)
 
 
-def test_cached_property():
-    class Foo:
-        def __init__(self):
-            self.bar_calls = 0
-
-        @cached_property
-        def bar(self):
-            self.bar_calls += 1
-            return []
-
-    foo = Foo()
-    bar = foo.bar
-    bar2 = foo.bar
-    assert bar2 is bar
-    assert foo.bar_calls == 1
-
-
 class Bar:
     def __init__(self) -> None:
         self.foo_calls: Dict[int, int] = collections.Counter()
diff --git a/cirq-core/cirq/circuits/circuit_operation.py b/cirq-core/cirq/circuits/circuit_operation.py
index 539e3fe2003..2f0766f7315 100644
--- a/cirq-core/cirq/circuits/circuit_operation.py
+++ b/cirq-core/cirq/circuits/circuit_operation.py
@@ -19,6 +19,7 @@
 component operations in order, including any nested CircuitOperations.
 """
 import math
+from functools import cached_property
 from typing import (
     Callable,
     cast,
@@ -38,7 +39,7 @@
 import sympy
 
 from cirq import circuits, ops, protocols, value, study
-from cirq._compat import cached_property, proper_repr
+from cirq._compat import proper_repr
 
 if TYPE_CHECKING:
     import cirq
diff --git a/cirq-core/cirq/circuits/frozen_circuit.py b/cirq-core/cirq/circuits/frozen_circuit.py
index 7fd0edcc9a3..b97583931e7 100644
--- a/cirq-core/cirq/circuits/frozen_circuit.py
+++ b/cirq-core/cirq/circuits/frozen_circuit.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """An immutable version of the Circuit data structure."""
+from functools import cached_property
 from typing import (
     AbstractSet,
     FrozenSet,
@@ -90,7 +91,7 @@ def tags(self) -> Tuple[Hashable, ...]:
         """Returns a tuple of the Circuit's tags."""
         return self._tags
 
-    @_compat.cached_property
+    @cached_property
     def untagged(self) -> 'cirq.FrozenCircuit':
         """Returns the underlying FrozenCircuit without any tags."""
         return self._from_moments(self._moments) if self.tags else self
@@ -148,7 +149,7 @@ def _is_measurement_(self) -> bool:
     def all_qubits(self) -> FrozenSet['cirq.Qid']:
         return super().all_qubits()
 
-    @_compat.cached_property
+    @cached_property
     def _all_operations(self) -> Tuple['cirq.Operation', ...]:
         return tuple(super().all_operations())
 
diff --git a/cirq-core/cirq/devices/superconducting_qubits_noise_properties.py b/cirq-core/cirq/devices/superconducting_qubits_noise_properties.py
index 13310e20ef4..f1d1e2fdc3b 100644
--- a/cirq-core/cirq/devices/superconducting_qubits_noise_properties.py
+++ b/cirq-core/cirq/devices/superconducting_qubits_noise_properties.py
@@ -17,9 +17,10 @@
 
 import abc
 from dataclasses import dataclass, field
+from functools import cached_property
 from typing import Dict, TYPE_CHECKING, List, Set, Type
 
-from cirq import _compat, ops, devices
+from cirq import ops, devices
 from cirq.devices import noise_utils
 
 if TYPE_CHECKING:
@@ -131,7 +132,7 @@ def _get_pauli_error(self, p_error: float, op_id: noise_utils.OpIdentifier):
             p_error -= noise_utils.decoherence_pauli_error(self.t1_ns[q], self.tphi_ns[q], time_ns)
         return p_error
 
-    @_compat.cached_property
+    @cached_property
     def _depolarizing_error(self) -> Dict[noise_utils.OpIdentifier, float]:
         """Returns the portion of Pauli error from depolarization."""
         depol_errors = {}
diff --git a/cirq-core/cirq/ops/clifford_gate.py b/cirq-core/cirq/ops/clifford_gate.py
index 47021272a23..c3021bf9bbc 100644
--- a/cirq-core/cirq/ops/clifford_gate.py
+++ b/cirq-core/cirq/ops/clifford_gate.py
@@ -20,7 +20,7 @@
 
 from cirq import protocols, value, linalg, qis
 from cirq._import import LazyLoader
-from cirq._compat import cached_property, cached_method
+from cirq._compat import cached_method
 from cirq.ops import common_gates, named_qubit, raw_types, pauli_gates, phased_x_z_gate
 from cirq.ops.pauli_gates import Pauli
 from cirq.type_workarounds import NotImplementedType
@@ -693,7 +693,7 @@ def to_phased_xz_gate(self) -> phased_x_z_gate.PhasedXZGate:
         """
         return self._to_phased_xz_gate
 
-    @cached_property
+    @functools.cached_property
     def _to_phased_xz_gate(self) -> phased_x_z_gate.PhasedXZGate:
         x_to_flip, z_to_flip = self.clifford_tableau.rs
         flip_index = int(z_to_flip) * 2 + x_to_flip
@@ -792,7 +792,7 @@ def _has_unitary_(self) -> bool:
     def _unitary_(self) -> np.ndarray:
         return self._unitary
 
-    @cached_property
+    @functools.cached_property
     def _unitary(self) -> np.ndarray:
         mat = np.eye(2)
         qubit = named_qubit.NamedQubit('arbitrary')
@@ -810,7 +810,7 @@ def decompose_gate(self) -> Sequence['cirq.Gate']:
         """
         return self._decompose_gate
 
-    @cached_property
+    @functools.cached_property
     def _decompose_gate(self) -> Sequence['cirq.Gate']:
         if self == SingleQubitCliffordGate.H:
             return [common_gates.H]
@@ -829,7 +829,7 @@ def decompose_rotation(self) -> Sequence[Tuple[Pauli, int]]:
         """
         return self._decompose_rotation
 
-    @cached_property
+    @functools.cached_property
     def _decompose_rotation(self) -> Sequence[Tuple[Pauli, int]]:
         x_rot = self.pauli_tuple(pauli_gates.X)
         y_rot = self.pauli_tuple(pauli_gates.Y)
@@ -926,7 +926,7 @@ def _circuit_diagram_info_(
     def _value_equality_values_(self):
         return self._value_equality_values
 
-    @cached_property
+    @functools.cached_property
     def _value_equality_values(self):
         return self._clifford_tableau.matrix().tobytes() + self._clifford_tableau.rs.tobytes()
 
diff --git a/cirq-core/cirq/ops/control_values.py b/cirq-core/cirq/ops/control_values.py
index 8aedf03617e..bcb790b632e 100644
--- a/cirq-core/cirq/ops/control_values.py
+++ b/cirq-core/cirq/ops/control_values.py
@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import abc
+from functools import cached_property
 from typing import Collection, Tuple, TYPE_CHECKING, Any, Dict, Iterator, Optional, Sequence, Union
 import itertools
 
-from cirq import protocols, value, _compat
+from cirq import protocols, value
 
 if TYPE_CHECKING:
     import cirq
@@ -144,7 +145,7 @@ def __init__(self, data: Sequence[Union[int, Collection[int]]]):
             (cv,) if isinstance(cv, int) else tuple(sorted(set(cv))) for cv in data
         )
 
-    @_compat.cached_property
+    @cached_property
     def is_trivial(self) -> bool:
         return self._qubit_sums == ((1,),) * self._num_qubits_()
 
@@ -252,7 +253,7 @@ def __init__(self, data: Collection[Sequence[int]], *, name: Optional[str] = Non
         if not all(len(p) == num_qubits for p in self._conjunctions):
             raise ValueError(f'Each term of {self._conjunctions} should be of length {num_qubits}.')
 
-    @_compat.cached_property
+    @cached_property
     def is_trivial(self) -> bool:
         return self._conjunctions == ((1,) * self._num_qubits_(),)
 
diff --git a/cirq-core/cirq/sim/state_vector_simulator.py b/cirq-core/cirq/sim/state_vector_simulator.py
index 053ac2b0a48..35eb3d8d5e2 100644
--- a/cirq-core/cirq/sim/state_vector_simulator.py
+++ b/cirq-core/cirq/sim/state_vector_simulator.py
@@ -14,6 +14,7 @@
 """Abstract classes for simulations which keep track of state vector."""
 
 import abc
+from functools import cached_property
 from typing import Any, Dict, Iterator, Sequence, Type, TYPE_CHECKING, Generic, TypeVar
 
 import numpy as np
@@ -121,7 +122,7 @@ def __init__(
             qubit_map=final_simulator_state.qubit_map,
         )
 
-    @_compat.cached_property
+    @cached_property
     def final_state_vector(self) -> np.ndarray:
         return self._get_merged_sim_state().target_tensor.reshape(-1)
 
diff --git a/cirq-ft/cirq_ft/algos/and_gate.py b/cirq-ft/cirq_ft/algos/and_gate.py
index 1da187793cd..c4210d8ccad 100644
--- a/cirq-ft/cirq_ft/algos/and_gate.py
+++ b/cirq-ft/cirq_ft/algos/and_gate.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Sequence, Tuple
 
 import numpy as np
@@ -19,7 +20,6 @@
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from cirq_ft import infra
 
 
diff --git a/cirq-ft/cirq_ft/algos/apply_gate_to_lth_target.py b/cirq-ft/cirq_ft/algos/apply_gate_to_lth_target.py
index bc9c17ecc30..6971b3711cb 100644
--- a/cirq-ft/cirq_ft/algos/apply_gate_to_lth_target.py
+++ b/cirq-ft/cirq_ft/algos/apply_gate_to_lth_target.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 import itertools
 from typing import Callable, Sequence, Tuple
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import unary_iteration_gate
 
diff --git a/cirq-ft/cirq_ft/algos/arithmetic_gates.py b/cirq-ft/cirq_ft/algos/arithmetic_gates.py
index 4d534288975..4cc34974f95 100644
--- a/cirq-ft/cirq_ft/algos/arithmetic_gates.py
+++ b/cirq-ft/cirq_ft/algos/arithmetic_gates.py
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Iterable, Iterator, List, Optional, Sequence, Tuple, Union
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from numpy.typing import NDArray
 
 from cirq_ft import infra
diff --git a/cirq-ft/cirq_ft/algos/generic_select.py b/cirq-ft/cirq_ft/algos/generic_select.py
index 8822beb32f6..46654be4e26 100644
--- a/cirq-ft/cirq_ft/algos/generic_select.py
+++ b/cirq-ft/cirq_ft/algos/generic_select.py
@@ -14,13 +14,13 @@
 
 """Gates for applying generic selected unitaries."""
 
+from functools import cached_property
 from typing import Collection, Optional, Sequence, Tuple, Union
 from numpy.typing import NDArray
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import select_and_prepare, unary_iteration_gate
 
diff --git a/cirq-ft/cirq_ft/algos/hubbard_model.py b/cirq-ft/cirq_ft/algos/hubbard_model.py
index c182dc89a0b..943870cb5ba 100644
--- a/cirq-ft/cirq_ft/algos/hubbard_model.py
+++ b/cirq-ft/cirq_ft/algos/hubbard_model.py
@@ -46,13 +46,13 @@
 
 See the documentation for `PrepareHubbard` and `SelectHubbard` for details.
 """
+from functools import cached_property
 from typing import Collection, Optional, Sequence, Tuple, Union
 from numpy.typing import NDArray
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import and_gate, apply_gate_to_lth_target, arithmetic_gates
 from cirq_ft.algos import prepare_uniform_superposition as prep_u
diff --git a/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle.py b/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle.py
index 7fee906ccf7..7f482293c95 100644
--- a/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle.py
+++ b/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Tuple
 from numpy.typing import NDArray
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import select_and_prepare
 from cirq_ft.algos.mean_estimation import arctan
diff --git a/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle_test.py b/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle_test.py
index 52e99cda1d2..49dd34bbbe6 100644
--- a/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle_test.py
+++ b/cirq-ft/cirq_ft/algos/mean_estimation/complex_phase_oracle_test.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 import math
 from typing import Optional, Tuple
 
@@ -20,7 +21,6 @@
 import numpy as np
 import pytest
 from attr import frozen
-from cirq._compat import cached_property
 from cirq_ft.algos.mean_estimation.complex_phase_oracle import ComplexPhaseOracle
 from cirq_ft.infra import bit_tools
 from cirq_ft.infra import testing as cq_testing
diff --git a/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator.py b/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator.py
index 3804cf9eee6..8d905958e76 100644
--- a/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator.py
+++ b/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Collection, Optional, Sequence, Tuple, Union
 from numpy.typing import NDArray
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import reflection_using_prepare as rup
 from cirq_ft.algos import select_and_prepare as sp
diff --git a/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator_test.py b/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator_test.py
index 93043d80514..19864608bf2 100644
--- a/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator_test.py
+++ b/cirq-ft/cirq_ft/algos/mean_estimation/mean_estimation_operator_test.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Optional, Sequence, Tuple
 
 import cirq
@@ -20,7 +21,6 @@
 import pytest
 from attr import frozen
 from cirq_ft import infra
-from cirq._compat import cached_property
 from cirq_ft.algos.mean_estimation import CodeForRandomVariable, MeanEstimationOperator
 from cirq_ft.infra import bit_tools
 from cirq_ft.deprecation import allow_deprecated_cirq_ft_use_in_tests
diff --git a/cirq-ft/cirq_ft/algos/multi_control_multi_target_pauli.py b/cirq-ft/cirq_ft/algos/multi_control_multi_target_pauli.py
index f098f0799c1..7d6142fb175 100644
--- a/cirq-ft/cirq_ft/algos/multi_control_multi_target_pauli.py
+++ b/cirq-ft/cirq_ft/algos/multi_control_multi_target_pauli.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Tuple
 from numpy.typing import NDArray
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import and_gate
 
diff --git a/cirq-ft/cirq_ft/algos/prepare_uniform_superposition.py b/cirq-ft/cirq_ft/algos/prepare_uniform_superposition.py
index ca7acb297d5..3564e654037 100644
--- a/cirq-ft/cirq_ft/algos/prepare_uniform_superposition.py
+++ b/cirq-ft/cirq_ft/algos/prepare_uniform_superposition.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Tuple
 from numpy.typing import NDArray
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import and_gate, arithmetic_gates
 
diff --git a/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array.py b/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array.py
index 07bf220994e..977111221c7 100644
--- a/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array.py
+++ b/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array.py
@@ -13,12 +13,13 @@
 # limitations under the License.
 
 import abc
+from functools import cached_property
 from typing import Sequence, Tuple
 from numpy.typing import NDArray
 
 import cirq
 import numpy as np
-from cirq._compat import cached_method, cached_property
+from cirq._compat import cached_method
 from cirq_ft import infra
 from cirq_ft.algos import qrom
 from cirq_ft.infra.bit_tools import iter_bits
diff --git a/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array_test.py b/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array_test.py
index 21b3b263676..267dabfbe5e 100644
--- a/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array_test.py
+++ b/cirq-ft/cirq_ft/algos/programmable_rotation_gate_array_test.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Tuple
 from numpy.typing import NDArray
 
@@ -20,7 +21,6 @@
 import numpy as np
 import pytest
 from cirq_ft import infra
-from cirq._compat import cached_property
 from cirq_ft.infra.bit_tools import iter_bits
 from cirq_ft.deprecation import allow_deprecated_cirq_ft_use_in_tests
 
diff --git a/cirq-ft/cirq_ft/algos/qrom.py b/cirq-ft/cirq_ft/algos/qrom.py
index ab150b585f5..86f04b44b9d 100644
--- a/cirq-ft/cirq_ft/algos/qrom.py
+++ b/cirq-ft/cirq_ft/algos/qrom.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Callable, Sequence, Tuple
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import and_gate, unary_iteration_gate
 from numpy.typing import ArrayLike, NDArray
diff --git a/cirq-ft/cirq_ft/algos/qubitization_walk_operator.py b/cirq-ft/cirq_ft/algos/qubitization_walk_operator.py
index 81219e4fb20..565842d6a51 100644
--- a/cirq-ft/cirq_ft/algos/qubitization_walk_operator.py
+++ b/cirq-ft/cirq_ft/algos/qubitization_walk_operator.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Collection, Optional, Sequence, Tuple, Union
 from numpy.typing import NDArray
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import reflection_using_prepare, select_and_prepare
 
diff --git a/cirq-ft/cirq_ft/algos/reflection_using_prepare.py b/cirq-ft/cirq_ft/algos/reflection_using_prepare.py
index 97f01b59ed9..4a084cee4a6 100644
--- a/cirq-ft/cirq_ft/algos/reflection_using_prepare.py
+++ b/cirq-ft/cirq_ft/algos/reflection_using_prepare.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Collection, Optional, Sequence, Tuple, Union
 from numpy.typing import NDArray
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import multi_control_multi_target_pauli as mcmt
 from cirq_ft.algos import select_and_prepare
diff --git a/cirq-ft/cirq_ft/algos/select_and_prepare.py b/cirq-ft/cirq_ft/algos/select_and_prepare.py
index 836d8b62ea0..b369e2c9f9b 100644
--- a/cirq-ft/cirq_ft/algos/select_and_prepare.py
+++ b/cirq-ft/cirq_ft/algos/select_and_prepare.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import abc
+from functools import cached_property
 from typing import Tuple
 
-from cirq._compat import cached_property
 from cirq_ft import infra
 
 
diff --git a/cirq-ft/cirq_ft/algos/select_swap_qrom.py b/cirq-ft/cirq_ft/algos/select_swap_qrom.py
index d9b23ee75d3..169be003e8c 100644
--- a/cirq-ft/cirq_ft/algos/select_swap_qrom.py
+++ b/cirq-ft/cirq_ft/algos/select_swap_qrom.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import List, Optional, Sequence, Tuple
 from numpy.typing import NDArray
 
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import qrom, swap_network
 
diff --git a/cirq-ft/cirq_ft/algos/selected_majorana_fermion.py b/cirq-ft/cirq_ft/algos/selected_majorana_fermion.py
index c473f7032ee..057b194d7db 100644
--- a/cirq-ft/cirq_ft/algos/selected_majorana_fermion.py
+++ b/cirq-ft/cirq_ft/algos/selected_majorana_fermion.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Sequence, Union, Tuple
 from numpy.typing import NDArray
 
@@ -19,7 +20,6 @@
 import cirq
 import numpy as np
 
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import unary_iteration_gate
 
diff --git a/cirq-ft/cirq_ft/algos/state_preparation.py b/cirq-ft/cirq_ft/algos/state_preparation.py
index 9cb0291efde..6237ae60159 100644
--- a/cirq-ft/cirq_ft/algos/state_preparation.py
+++ b/cirq-ft/cirq_ft/algos/state_preparation.py
@@ -20,13 +20,13 @@
 largest absolute error that one can tolerate in the prepared amplitudes.
 """
 
+from functools import cached_property
 from typing import List, Tuple
 from numpy.typing import NDArray
 
 import attr
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft import infra, linalg
 from cirq_ft.algos import (
     arithmetic_gates,
diff --git a/cirq-ft/cirq_ft/algos/swap_network.py b/cirq-ft/cirq_ft/algos/swap_network.py
index 8a2f9362231..62512de2486 100644
--- a/cirq-ft/cirq_ft/algos/swap_network.py
+++ b/cirq-ft/cirq_ft/algos/swap_network.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from typing import Sequence, Union, Tuple
 from numpy.typing import NDArray
 
 import attr
 import cirq
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import multi_control_multi_target_pauli as mcmtp
 
diff --git a/cirq-ft/cirq_ft/algos/unary_iteration.ipynb b/cirq-ft/cirq_ft/algos/unary_iteration.ipynb
index e2920d7b926..aa3bda1e117 100644
--- a/cirq-ft/cirq_ft/algos/unary_iteration.ipynb
+++ b/cirq-ft/cirq_ft/algos/unary_iteration.ipynb
@@ -260,8 +260,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from functools import cached_property\n",
     "import cirq\n",
-    "from cirq._compat import cached_property\n",
     "from cirq_ft import Signature, GateWithRegisters\n",
     "from cirq_ft.infra.bit_tools import iter_bits\n",
     "\n",
@@ -471,8 +471,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from functools import cached_property\n",
     "from cirq_ft import Register, SelectionRegister, UnaryIterationGate\n",
-    "from cirq._compat import cached_property\n",
     "\n",
     "class ApplyXToLthQubit(UnaryIterationGate):\n",
     "    def __init__(self, selection_bitsize: int, target_bitsize: int, control_bitsize: int = 1):\n",
@@ -572,4 +572,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
\ No newline at end of file
+}
diff --git a/cirq-ft/cirq_ft/algos/unary_iteration_gate.py b/cirq-ft/cirq_ft/algos/unary_iteration_gate.py
index 16190f828b3..6cd5d3413cb 100644
--- a/cirq-ft/cirq_ft/algos/unary_iteration_gate.py
+++ b/cirq-ft/cirq_ft/algos/unary_iteration_gate.py
@@ -13,13 +13,13 @@
 # limitations under the License.
 
 import abc
+from functools import cached_property
 from typing import Callable, Dict, Iterator, List, Sequence, Tuple
 from numpy.typing import NDArray
 
 import cirq
 import numpy as np
 
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.algos import and_gate
 from cirq_ft.deprecation import deprecated_cirq_ft_function
diff --git a/cirq-ft/cirq_ft/algos/unary_iteration_gate_test.py b/cirq-ft/cirq_ft/algos/unary_iteration_gate_test.py
index 81e16b77474..d3aa68b93ee 100644
--- a/cirq-ft/cirq_ft/algos/unary_iteration_gate_test.py
+++ b/cirq-ft/cirq_ft/algos/unary_iteration_gate_test.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 import itertools
 from typing import Sequence, Tuple
 
 import cirq
 import cirq_ft
 import pytest
-from cirq._compat import cached_property
 from cirq_ft import infra
 from cirq_ft.infra.bit_tools import iter_bits
 from cirq_ft.infra.jupyter_tools import execute_notebook
diff --git a/cirq-ft/cirq_ft/infra/testing.py b/cirq-ft/cirq_ft/infra/testing.py
index 088b46dab45..a10b0877586 100644
--- a/cirq-ft/cirq_ft/infra/testing.py
+++ b/cirq-ft/cirq_ft/infra/testing.py
@@ -13,11 +13,11 @@
 # limitations under the License.
 
 from dataclasses import dataclass
+from functools import cached_property
 from typing import Any, Dict, List, Sequence, Tuple
 from numpy.typing import NDArray
 import cirq
 import numpy as np
-from cirq._compat import cached_property
 from cirq_ft.infra import gate_with_registers, t_complexity_protocol, merge_qubits, get_named_qubits
 from cirq_ft.infra.decompose_protocol import _decompose_once_considering_known_decomposition
 
diff --git a/cirq-google/cirq_google/devices/google_noise_properties.py b/cirq-google/cirq_google/devices/google_noise_properties.py
index 3b5cfb723da..9d8e5df6c81 100644
--- a/cirq-google/cirq_google/devices/google_noise_properties.py
+++ b/cirq-google/cirq_google/devices/google_noise_properties.py
@@ -16,6 +16,7 @@
 """Class for representing noise on a Google device."""
 
 import dataclasses
+from functools import cached_property
 from typing import Any, Dict, List, Sequence, Set, Type, TypeVar, Union
 import numpy as np
 
@@ -106,7 +107,7 @@ def with_params(
         tphi_ns: Union[None, float, Dict['cirq.Qid', float]] = None,
         readout_errors: Union[None, Sequence[float], Dict['cirq.Qid', Sequence[float]]] = None,
         gate_pauli_errors: Union[
-            None, float, Dict[Union[Type['cirq.Gate'], noise_utils.OpIdentifier], float],
+            None, float, Dict[Union[Type['cirq.Gate'], noise_utils.OpIdentifier], float]
         ] = None,
         fsim_errors: Union[
             None,
@@ -204,7 +205,7 @@ def symmetric_two_qubit_gates(cls) -> Set[type]:
     def asymmetric_two_qubit_gates(cls) -> Set[type]:
         return set()
 
-    @_compat.cached_property
+    @cached_property
     def _depolarizing_error(self) -> Dict[noise_utils.OpIdentifier, float]:
         depol_errors = super()._depolarizing_error
 
diff --git a/cirq-google/cirq_google/engine/engine_client.py b/cirq-google/cirq_google/engine/engine_client.py
index 9d2fb8bae92..f73e2b3c26a 100644
--- a/cirq-google/cirq_google/engine/engine_client.py
+++ b/cirq-google/cirq_google/engine/engine_client.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import datetime
+from functools import cached_property
 import sys
 from typing import (
     AsyncIterable,
@@ -35,7 +36,6 @@
 from google.protobuf import any_pb2, field_mask_pb2
 from google.protobuf.timestamp_pb2 import Timestamp
 
-from cirq._compat import cached_property
 from cirq._compat import deprecated_parameter
 from cirq_google.cloud import quantum
 from cirq_google.engine.asyncio_executor import AsyncioExecutor