diff --git a/lib/OC.php b/lib/OC.php
index 5c58aee2091a8..eeaf7c190cd4c 100644
--- a/lib/OC.php
+++ b/lib/OC.php
@@ -1367,6 +1367,8 @@ private static function resetStaticProperties(): void {
 		\OC_App::reset();
 		\OC_Helper::reset();
 		Filesystem::reset();
+		/** @psalm-suppress InternalMethod */
+		\OCP\Util::resetStaticProperties();
 	}
 
 	/**
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index b75c3e6982694..258afbfe1d20a 100644
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -342,7 +342,7 @@ protected function includeLegacyFileRoute(array $parameters): void {
 		unset($param['_route']);
 		$_GET = array_merge($_GET, $param);
 		unset($param);
-		require_once $parameters['file'];
+		require $parameters['file'];
 	}
 
 	/**
diff --git a/lib/public/Util.php b/lib/public/Util.php
index 89604dbab1022..ad0a7e5322da2 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -33,6 +33,18 @@ class Util {
 	/** @psalm-suppress ImpureStaticProperty */
 	private static ?bool $needUpgradeCache = null;
 
+	/**
+	 * Reset static vars
+	 * @since 36.0.0
+	 * @internal Only for internal use, may be removed at any point
+	 */
+	public static function resetStaticProperties(): void {
+		self::$scriptsInit = [];
+		self::$scripts = [];
+		self::$scriptDeps = [];
+		self::$needUpgradeCache = null;
+	}
+
 	/**
 	 * get the current installed version of Nextcloud
 	 * @return array