cachebox 6.2.5__tar.gz → 6.2.7__tar.gz

{cachebox-6.2.5 → cachebox-6.2.7}/.github/workflows/CI.yml

@@ -16,6 +16,7 @@ concurrency:
 env:
   (^_^): &interpreters "3.10 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t pypy3.11"
   ○_○: &interpreters_without_pypy "3.10 3.11 3.12 3.13 3.14 3.14t 3.15 3.15t"
+  (o_o): &interpreters_win_arm64 "3.11 3.12 3.13 3.14 3.14t 3.15 3.15t"
 
 jobs:
   tools:
@@ -41,7 +42,7 @@ jobs:
           python-version: "3.14"
 
       - name: "Install uv"
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           # zizmor: ignore[cache-poisoning]
           enable-cache: ${{ github.event_name == 'pull_request' }}
@@ -57,21 +58,24 @@ jobs:
     strategy:
       matrix:
         platform:
-          - { target: x86_64, interpreter: *interpreters }
-          - { target: x86, interpreter: *interpreters }
-          - { target: aarch64, interpreter: *interpreters }
-          - { target: armv7, interpreter: *interpreters }
-          - { target: s390x, interpreter: *interpreters }
-          - { target: ppc64le, interpreter: *interpreters }
+          - { target: x86_64-unknown-linux-gnu, arch: x86_64, interpreter: *interpreters }
+          - { target: i686-unknown-linux-gnu, arch: x86, interpreter: *interpreters }
+          - { target: aarch64-unknown-linux-gnu, arch: aarch64, interpreter: *interpreters }
+          - { target: armv7-unknown-linux-gnueabihf, arch: armv7, interpreter: *interpreters }
+          - { target: s390x-unknown-linux-gnu, arch: s390x, interpreter: *interpreters }
+          - { target: powerpc64le-unknown-linux-gnu, arch: ppc64le, interpreter: *interpreters }
+          - { target: riscv64gc-unknown-linux-gnu, arch: riscv64, interpreter: *interpreters }
 
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
 
-      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
-          python-version: "3.x"
+          activate-environment: true
+          enable-cache: false
+          python-version: "3"
 
       - uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
         # zizmor: ignore[cache-poisoning]
@@ -87,7 +91,7 @@ jobs:
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: wheels-linux-${{ matrix.platform.target }}
+          name: wheels-linux-${{ matrix.platform.arch }}
           path: dist
 
   build-musllinux:
@@ -95,19 +99,22 @@ jobs:
     strategy:
       matrix:
         platform:
-          - { target: x86_64, interpreter: *interpreters }
-          - { target: x86, interpreter: *interpreters }
-          - { target: aarch64, interpreter: *interpreters }
-          - { target: armv7, interpreter: *interpreters }
+          - { target: x86_64-unknown-linux-musl, arch: x86_64, interpreter: *interpreters }
+          - { target: i686-unknown-linux-musl, arch: x86, interpreter: *interpreters }
+          - { target: aarch64-unknown-linux-musl, arch: aarch64, interpreter: *interpreters }
+          - { target: armv7-unknown-linux-musleabihf, arch: armv7, interpreter: *interpreters }
+          - { target: riscv64gc-unknown-linux-musl, arch: riscv64, interpreter: *interpreters }
 
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
 
-      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
-          python-version: "3.x"
+          activate-environment: true
+          enable-cache: false
+          python-version: "3"
 
       - uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
         # zizmor: ignore[cache-poisoning]
@@ -123,16 +130,17 @@ jobs:
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: wheels-musllinux-${{ matrix.platform.target }}
+          name: wheels-musllinux-${{ matrix.platform.arch }}
           path: dist
 
   build-windows:
-    runs-on: windows-latest
+    runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
         platform:
-          - { target: x64, interpreter: *interpreters }
-          - { target: x86, interpreter: *interpreters_without_pypy }
+          - { runner: windows-latest, target: x64, arch: x64, interpreter: *interpreters }
+          - { runner: windows-latest, target: x86, arch: x86, interpreter: *interpreters_without_pypy }
+          - { runner: windows-11-arm, target: aarch64, arch: arm64, interpreter: *interpreters_win_arm64 }
 
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -142,7 +150,7 @@ jobs:
       - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: "3.x"
-          architecture: ${{ matrix.platform.target }}
+          architecture: ${{ matrix.platform.arch }}
 
       - uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
         # zizmor: ignore[cache-poisoning]

{cachebox-6.2.5 → cachebox-6.2.7}/.github/workflows/docs.yml

@@ -20,7 +20,7 @@ jobs:
           python-version: 3.14
 
       - name: "Install uv"
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: false
 

{cachebox-6.2.5 → cachebox-6.2.7}/.github/workflows/python-test.yml

@@ -40,7 +40,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable # zizmor: ignore[unpinned-uses]
 
-      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
         if: github.event_name == 'pull_request' && github.run_attempt == 1
         with:
           lookup-only: false # zizmor: ignore[cache-poisoning]
@@ -52,7 +52,7 @@ jobs:
           allow-prereleases: true
 
       - name: "Install uv"
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: false
 
@@ -93,7 +93,7 @@ jobs:
           python-version: "3.13"
 
       - name: "Install uv"
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
         with:
           enable-cache: false
 

{cachebox-6.2.5 → cachebox-6.2.7}/Cargo.lock

@@ -37,7 +37,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "cachebox"
-version = "6.2.5"
+version = "6.2.7"
 dependencies = [
  "allocator-api2",
  "cfg-if",
@@ -50,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.4.2"
+version = "1.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d262e149917187838d5b42777c8253bcb64500067342904e7d429499a6f277e"
+checksum = "0ad534f4357a5264cce5019c989cf66a4f0dc4e0d1b1d15f8aacec0ff7360273"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -91,27 +91,27 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de"
+checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890"
 
 [[package]]
 name = "futures-core"
-version = "0.3.33"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
+checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
 
 [[package]]
 name = "futures-task"
-version = "0.3.33"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
+checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
 
 [[package]]
 name = "futures-util"
-version = "0.3.33"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
+checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -177,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.33"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "num-traits"

{cachebox-6.2.5 → cachebox-6.2.7}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cachebox"
-version = "6.2.5"
+version = "6.2.7"
 edition = "2021"
 description = "The fastest memoizing and caching Python library written in Rust"
 readme = "README.md"

{cachebox-6.2.5 → cachebox-6.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachebox
-Version: 6.2.5
+Version: 6.2.7
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{cachebox-6.2.5 → cachebox-6.2.7}/cachebox/_cachebox.py

@@ -161,16 +161,15 @@ class TTLCache(_CoreTTLCache[KT, VT]):
         )
 
         self._thread: threading.Thread | None = None
-        self._thread_is_running: bool = False
+        self._stop_event = threading.Event()
 
         if sweep_interval is not None:
             if isinstance(sweep_interval, timedelta):
                 sweep_interval = sweep_interval.total_seconds()
 
             if sweep_interval < 1:
-                raise ValueError("sweep_interval must be more than 1 seconds.")
+                raise ValueError("sweep_interval must be at least 1 second.")
 
-            self._thread_is_running = True
             self._thread = threading.Thread(
                 target=self._sweeper_thread,
                 args=(sweep_interval,),
@@ -185,17 +184,19 @@ class TTLCache(_CoreTTLCache[KT, VT]):
         """The configured ``sweep_interval`` in seconds."""
         return self._sweep_interval
 
-    def _sweeper_thread(self, interval: float):
-        while self._thread_is_running:
-            time.sleep(interval)
+    def _sweeper_thread(self, interval: float) -> None:
+        while not self._stop_event.wait(interval):
             self.expire()
 
     def stop_sweeper(self) -> None:
         """Signals the background sweeper thread to stop, if one is active."""
-        self._thread_is_running = False
+        self._stop_event.set()
 
     def __del__(self) -> None:
-        self.stop_sweeper()
+        # If super().__init__ raises for any reason (bad arguments, type error, ...),
+        # the assignment to self._stop_event never happens.
+        if hasattr(self, "_stop_event"):
+            self.stop_sweeper()
 
 
 class VTTLCache(_CoreVTTLCache[KT, VT]):
@@ -333,16 +334,15 @@ class VTTLCache(_CoreVTTLCache[KT, VT]):
         )
 
         self._thread: threading.Thread | None = None
-        self._thread_is_running: bool = False
+        self._stop_event = threading.Event()
 
         if sweep_interval is not None:
             if isinstance(sweep_interval, timedelta):
                 sweep_interval = sweep_interval.total_seconds()
 
             if sweep_interval < 1:
-                raise ValueError("sweep_interval must be more than 1 seconds.")
+                raise ValueError("sweep_interval must be at least 1 second.")
 
-            self._thread_is_running = True
             self._thread = threading.Thread(
                 target=self._sweeper_thread,
                 args=(sweep_interval,),
@@ -357,14 +357,16 @@ class VTTLCache(_CoreVTTLCache[KT, VT]):
         """The configured ``sweep_interval`` in seconds."""
         return self._sweep_interval
 
-    def _sweeper_thread(self, interval: float):
-        while self._thread_is_running:
-            time.sleep(interval)
+    def _sweeper_thread(self, interval: float) -> None:
+        while not self._stop_event.wait(interval):
             self.expire()
 
     def stop_sweeper(self) -> None:
         """Signals the background sweeper thread to stop, if one is active."""
-        self._thread_is_running = False
+        self._stop_event.set()
 
     def __del__(self) -> None:
-        self.stop_sweeper()
+        # If super().__init__ raises for any reason (bad arguments, type error, ...),
+        # the assignment to self._stop_event never happens.
+        if hasattr(self, "_stop_event"):
+            self.stop_sweeper()

{cachebox-6.2.5 → cachebox-6.2.7}/cachebox/_wrappers.py

@@ -2,12 +2,14 @@ import inspect
 import typing
 from collections import namedtuple
 from contextlib import AbstractAsyncContextManager, AbstractContextManager
+from collections.abc import Callable, Hashable
 
 from cachebox._core import BaseCacheImpl, Cache
 
-_PostProcess: typing.TypeAlias = typing.Callable[[typing.Any], typing.Any]
-_Callback: typing.TypeAlias = typing.Callable[[int, typing.Any, typing.Any], typing.Any]
-
+_PostProcess: typing.TypeAlias = Callable[[typing.Any], typing.Any]
+_Callback: typing.TypeAlias = Callable[
+    [int, typing.Any, typing.Any], typing.Any
+]
 
 class _Lock:
     __slots__ = ("_lock", "waiters")
@@ -65,10 +67,10 @@ def _create_cache_info(cache, hits, misses) -> CacheInfo:
 
 def _cached_wrapper_without_lock(
     func,
-    cache: BaseCacheImpl | typing.Callable,
-    key_maker: typing.Callable[[tuple, dict], typing.Hashable],
+    cache: BaseCacheImpl | Callable,
+    key_maker: Callable[[tuple, dict], Hashable],
     clear_reuse: bool,
-    callback: typing.Callable[[int, typing.Any, typing.Any], None] | None,
+    callback: Callable[[int, typing.Any, typing.Any], None] | None,
     postprocess: _PostProcess | None,
 ):
     cache_is_fn = callable(cache)
@@ -139,10 +141,10 @@ async def _call_async_callback(callback, event, key, result):
 
 def _async_cached_wrapper_without_lock(
     func,
-    cache: BaseCacheImpl | typing.Callable,
-    key_maker: typing.Callable[[tuple, dict], typing.Hashable],
+    cache: BaseCacheImpl | Callable,
+    key_maker: Callable[[tuple, dict], Hashable],
     clear_reuse: bool,
-    callback: typing.Callable[[int, typing.Any, typing.Any], None] | None,
+    callback: Callable[[int, typing.Any, typing.Any], None] | None,
     postprocess: _PostProcess | None,
 ):
     cache_is_fn = callable(cache)
@@ -179,7 +181,7 @@ def _async_cached_wrapper_without_lock(
 
         result = await func(*args, **kwds)
         _cache.insert(key, result)
-        hits += 1
+        misses += 1
         await _call_async_callback(callback, EVENT_MISS, key, result)
 
         return postprocess(result) if postprocess is not None else result
@@ -202,12 +204,12 @@ def _async_cached_wrapper_without_lock(
 
 def _cached_wrapper(
     func,
-    cache: BaseCacheImpl | typing.Callable,
-    key_maker: typing.Callable[[tuple, dict], typing.Hashable],
+    cache: BaseCacheImpl | Callable,
+    key_maker: Callable[[tuple, dict], Hashable],
     clear_reuse: bool,
-    callback: typing.Callable[[int, typing.Any, typing.Any], None] | None,
+    callback: Callable[[int, typing.Any, typing.Any], None] | None,
     postprocess: _PostProcess | None,
-    lock_type: typing.Type[AbstractContextManager],
+    lock_type: type[AbstractContextManager],
 ):
     cache_is_fn = callable(cache)
 
@@ -221,8 +223,8 @@ def _cached_wrapper(
     hits = 0
     misses = 0
 
-    locks: Cache[typing.Hashable, _Lock] = Cache(0)
-    pending_errors: dict[typing.Hashable, BaseException] = {}
+    locks: Cache[Hashable, _Lock] = Cache(0)
+    pending_errors: dict[Hashable, BaseException] = {}
 
     def _wrapped(*args, **kwds):
         nonlocal hits, misses
@@ -308,12 +310,12 @@ def _cached_wrapper(
 
 def _async_cached_wrapper(
     func,
-    cache: BaseCacheImpl | typing.Callable,
+    cache: BaseCacheImpl | Callable,
     key_maker: typing.Callable[..., typing.Hashable],
     clear_reuse: bool,
     callback: _Callback | None,
     postprocess: _PostProcess | None,
-    lock_type: typing.Type[AbstractAsyncContextManager],
+    lock_type: type[AbstractAsyncContextManager],
 ):
     cache_is_fn = callable(cache)
     _make_key = (

{cachebox-6.2.5 → cachebox-6.2.7}/cachebox/utils.py

@@ -1,13 +1,16 @@
+import _thread
+import asyncio
 import functools
 import inspect
+import threading
 import typing
+from collections.abc import Callable, Hashable
+from contextlib import AbstractAsyncContextManager, AbstractContextManager
 from copy import copy as _shallow_copy
 from copy import deepcopy as _deep_copy
 
 from ._cachebox import BaseCacheImpl, LRUCache
 from ._wrappers import (
-    AbstractAsyncContextManager,
-    AbstractContextManager,
     CacheInfo,
     _async_cached_wrapper,
     _async_cached_wrapper_without_lock,
@@ -23,7 +26,7 @@ if typing.TYPE_CHECKING:
 KT = typing.TypeVar("KT")
 VT = typing.TypeVar("VT")
 DT = typing.TypeVar("DT")
-FT = typing.TypeVar("FT", bound=typing.Callable[..., typing.Any])
+FT = typing.TypeVar("FT", bound=Callable[..., typing.Any])
 
 
 _COPY_TYPES = frozenset((dict, list, set))
@@ -63,7 +66,7 @@ _KWDS_MARK = object()
 _FAST_TYPES = frozenset((int, str))
 
 
-def make_key(*args, **kwds) -> typing.Hashable:
+def make_key(*args: typing.Any, **kwds: typing.Any) -> Hashable:
     """
     Default cache key.
 
@@ -83,7 +86,7 @@ def make_key(*args, **kwds) -> typing.Hashable:
     return key
 
 
-def make_hash_key(*args, **kwds) -> int:
+def make_hash_key(*args: typing.Any, **kwds: typing.Any) -> int:
     """
     Key as the hash of all positional and keyword arguments.
 
@@ -98,7 +101,7 @@ def make_hash_key(*args, **kwds) -> int:
     return hash(key)
 
 
-def make_typed_key(*args, **kwds) -> tuple:
+def make_typed_key(*args: typing.Any, **kwds: typing.Any) -> tuple[typing.Any, ...]:
     """
     Key that includes the runtime type of every argument.
 
@@ -183,7 +186,7 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
         return self.__cache.maxsize
 
     @property
-    def getsizeof(self) -> typing.Callable[[KT, VT], int] | None:
+    def getsizeof(self) -> Callable[[KT, VT], int] | None:
         """Callable or None: The configured ``getsizeof`` function."""
         return self.__cache.getsizeof
 
@@ -271,7 +274,7 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
         value: VT,
         *args: typing.Any,
         **kwargs: typing.Any,
-    ) -> typing.Optional[VT]:
+    ) -> VT | None:
         return self._guard()
 
     def __setitem__(self, key: KT, value: VT) -> None:
@@ -285,7 +288,7 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
     ) -> None:
         return self._guard()
 
-    def get(self, key: KT, default: typing.Optional[DT] = None) -> typing.Union[VT, DT]:
+    def get(self, key: KT, default: DT | None = None) -> VT | DT:
         return self.__cache.get(key, default)
 
     def __getitem__(self, key: KT) -> VT:
@@ -294,13 +297,13 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
     def setdefault(
         self,
         key: KT,
-        default: typing.Optional[DT] = None,
+        default: DT | None = None,
         *args: typing.Any,
         **kwargs: typing.Any,
-    ) -> typing.Optional[VT | DT]:
+    ) -> VT | DT | None:
         return self._guard()
 
-    def pop(self, key: KT, default: DT = None) -> typing.Union[VT, DT]:
+    def pop(self, key: KT, default: DT | None = None) -> VT | DT:
         """
         Removes the specified key and returns the corresponding value.
 
@@ -319,7 +322,7 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
     def __delitem__(self, key: KT) -> None:
         return self._guard()
 
-    def popitem(self) -> typing.Tuple[KT, VT]:
+    def popitem(self) -> tuple[KT, VT]:
         return self._guard()  # type: ignore[return-value]
 
     def drain(self, n: int) -> int:
@@ -348,7 +351,7 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
         """
         return self._guard()
 
-    def items(self) -> typing.Iterable[typing.Tuple[KT, VT]]:
+    def items(self) -> typing.Iterable[tuple[KT, VT]]:
         return self.__cache.items()
 
     def values(self) -> typing.Iterable[VT]:
@@ -373,20 +376,9 @@ class Frozen(BaseCacheImpl[KT, VT]):  # pragma: no cover
 def _cast_lock(
     iscoroutinefunction: bool,
     lock: (
-        typing.Type[AbstractContextManager]
-        | typing.Type[AbstractAsyncContextManager]
-        | bool
-        | None
+        type[AbstractContextManager] | type[AbstractAsyncContextManager] | bool | None
     ) = True,
-) -> (
-    typing.Type[AbstractContextManager]
-    | typing.Type[AbstractAsyncContextManager]
-    | None
-):
-    import _thread
-    import asyncio
-    import threading
-
+) -> type[AbstractContextManager] | type[AbstractAsyncContextManager] | None:
     if lock is None or lock is False:
         return None
 
@@ -416,8 +408,8 @@ def _cast_lock(
 
 
 def cached(
-    cache: BaseCacheImpl | dict | typing.Callable[..., BaseCacheImpl] | None = None,
-    key_maker: typing.Callable[..., typing.Hashable] = make_key,
+    cache: BaseCacheImpl | dict | Callable[..., BaseCacheImpl] | None = None,
+    key_maker: Callable[..., Hashable] = make_key,
     clear_reuse: bool = False,
     callback: _Callback | None = None,
     copy_level: int = 1,
@@ -428,7 +420,7 @@ def cached(
         | bool
         | None
     ) = True,
-) -> typing.Callable[[FT], FT]:
+) -> Callable[[FT], FT]:
     """
     Decorator to memoize function/method results.