diff --git a/pyproject.toml b/pyproject.toml
index 937b52b2..06d065d9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -98,9 +98,14 @@ extend-ignore-identifiers-re = ['ND|Nd']
 
 [tool.mypy]
 strict = true
-disallow_subclassing_any = false
+strict_equality_for_none = true
+# required by repo-review
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
-warn_unreachable = false # required by repo-review
+warn_unreachable = false
+# experimental
+fixed_format_cache = true
+local_partial_types = true
+allow_redefinition_new = true
 
 [tool.pyright]
 exclude = [
diff --git a/scipy-stubs/optimize/cobyla.pyi b/scipy-stubs/optimize/cobyla.pyi
index 63d2ac09..e16e453e 100644
--- a/scipy-stubs/optimize/cobyla.pyi
+++ b/scipy-stubs/optimize/cobyla.pyi
@@ -1,12 +1,13 @@
 # This file is not meant for public use and will be removed in SciPy v2.0.0.
 
-from typing import Any
 from typing_extensions import deprecated
 
+from ._optimize import OptimizeResult as _OptimizeResult
+
 __all__ = ["OptimizeResult", "fmin_cobyla"]
 
 @deprecated("will be removed in SciPy v2.0.0")
-class OptimizeResult(Any): ...
+class OptimizeResult(_OptimizeResult): ...
 
 @deprecated("will be removed in SciPy v2.0.0")
 def fmin_cobyla(
diff --git a/scipy-stubs/optimize/lbfgsb.pyi b/scipy-stubs/optimize/lbfgsb.pyi
index 2f0768c2..1813bc98 100644
--- a/scipy-stubs/optimize/lbfgsb.pyi
+++ b/scipy-stubs/optimize/lbfgsb.pyi
@@ -1,15 +1,16 @@
 # This file is not meant for public use and will be removed in SciPy v2.0.0.
 
-from typing import Any
 from typing_extensions import deprecated
 
+from ._optimize import OptimizeResult as _OptimizeResult
+
 __all__ = ["LbfgsInvHessProduct", "OptimizeResult", "fmin_l_bfgs_b", "zeros"]
 
 @deprecated("will be removed in SciPy v2.0.0")
 def zeros(shape: object, dtype: object = ..., order: object = ..., *, device: object = ..., like: object = ...) -> object: ...
 
 @deprecated("will be removed in SciPy v2.0.0")
-class OptimizeResult(Any): ...
+class OptimizeResult(_OptimizeResult): ...
 
 @deprecated("will be removed in SciPy v2.0.0")
 def fmin_l_bfgs_b(
diff --git a/scipy-stubs/optimize/minpack.pyi b/scipy-stubs/optimize/minpack.pyi
index c23210be..80a6e9db 100644
--- a/scipy-stubs/optimize/minpack.pyi
+++ b/scipy-stubs/optimize/minpack.pyi
@@ -1,12 +1,13 @@
 # This file is not meant for public use and will be removed in SciPy v2.0.0.
 
-from typing import Any
 from typing_extensions import deprecated
 
+from ._optimize import OptimizeResult as _OptimizeResult
+
 __all__ = ["OptimizeResult", "OptimizeWarning", "curve_fit", "fixed_point", "fsolve", "least_squares", "leastsq", "zeros"]
 
 @deprecated("will be removed in SciPy v2.0.0")
-class OptimizeResult(Any): ...
+class OptimizeResult(_OptimizeResult): ...
 
 @deprecated("will be removed in SciPy v2.0.0")
 class OptimizeWarning(UserWarning): ...
diff --git a/scipy-stubs/optimize/optimize.pyi b/scipy-stubs/optimize/optimize.pyi
index dfeb6da8..8f4d6d2a 100644
--- a/scipy-stubs/optimize/optimize.pyi
+++ b/scipy-stubs/optimize/optimize.pyi
@@ -1,8 +1,9 @@
 # This file is not meant for public use and will be removed in SciPy v2.0.0.
 
-from typing import Any
 from typing_extensions import deprecated
 
+from ._optimize import OptimizeResult as _OptimizeResult
+
 __all__ = [
     "OptimizeResult",
     "OptimizeWarning",
@@ -31,7 +32,7 @@ __all__ = [
 def zeros(shape: object, dtype: object = ..., order: object = ..., *, device: object = ..., like: object = ...) -> object: ...
 
 @deprecated("will be removed in SciPy v2.0.0")
-class OptimizeResult(Any): ...
+class OptimizeResult(_OptimizeResult): ...
 
 @deprecated("will be removed in SciPy v2.0.0")
 class OptimizeWarning(UserWarning): ...
diff --git a/scipy-stubs/optimize/slsqp.pyi b/scipy-stubs/optimize/slsqp.pyi
index d44f510f..5cb9e133 100644
--- a/scipy-stubs/optimize/slsqp.pyi
+++ b/scipy-stubs/optimize/slsqp.pyi
@@ -4,10 +4,12 @@ from collections.abc import Callable
 from typing import Any
 from typing_extensions import deprecated
 
+from ._optimize import OptimizeResult as _OptimizeResult
+
 __all__ = ["OptimizeResult", "fmin_slsqp", "slsqp"]
 
 @deprecated("will be removed in SciPy v2.0.0")
-class OptimizeResult(Any): ...
+class OptimizeResult(_OptimizeResult): ...
 
 @deprecated("will be removed in SciPy v2.0.0")
 def fmin_slsqp(
diff --git a/scipy-stubs/optimize/tnc.pyi b/scipy-stubs/optimize/tnc.pyi
index 7926694e..102abbc9 100644
--- a/scipy-stubs/optimize/tnc.pyi
+++ b/scipy-stubs/optimize/tnc.pyi
@@ -1,15 +1,16 @@
 # This file is not meant for public use and will be removed in SciPy v2.0.0.
 
-from typing import Any
 from typing_extensions import deprecated
 
+from ._optimize import OptimizeResult as _OptimizeResult
+
 __all__ = ["OptimizeResult", "fmin_tnc", "zeros"]
 
 @deprecated("will be removed in SciPy v2.0.0")
 def zeros(shape: object, dtype: object = ..., order: object = ..., *, device: object = ..., like: object = ...) -> object: ...
 
 @deprecated("will be removed in SciPy v2.0.0")
-class OptimizeResult(Any): ...
+class OptimizeResult(_OptimizeResult): ...
 
 @deprecated("will be removed in SciPy v2.0.0")
 def fmin_tnc(