diff --git a/composer.json b/composer.json
index d87af90d3..b3c9ee616 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
-		"christophwurst/nextcloud": "^21@dev",
+		"christophwurst/nextcloud": "dev-master",
 		"phpunit/phpunit": "^9",
 		"nextcloud/coding-standard": "^1.0.0",
 		"symfony/event-dispatcher": "^4.0",
diff --git a/composer.lock b/composer.lock
index 45a248a27..e34fc1098 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c3c765fb5379719b5ab8824e9fbb03f9",
+    "content-hash": "33c2fe0cccf29841e021001c6430310a",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -301,25 +301,29 @@
         },
         {
             "name": "christophwurst/nextcloud",
-            "version": "v21.0.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "41e1476b4aed5bce7371895054049eca353729c5"
+                "reference": "cd35b7f4519d9b1c836443ec5dcd973d7f0f9cdd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/41e1476b4aed5bce7371895054049eca353729c5",
-                "reference": "41e1476b4aed5bce7371895054049eca353729c5",
+                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/cd35b7f4519d9b1c836443ec5dcd973d7f0f9cdd",
+                "reference": "cd35b7f4519d9b1c836443ec5dcd973d7f0f9cdd",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0"
+                "php": "^7.4 || ~8.0 || ~8.1",
+                "psr/container": "^1.0",
+                "psr/event-dispatcher": "^1.0",
+                "psr/log": "^1.1"
             },
+            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "21.0.0-dev"
+                    "dev-master": "24.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -335,9 +339,9 @@
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
             "support": {
                 "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues",
-                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/v21.0.0"
+                "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master"
             },
-            "time": "2021-03-01T08:42:25+00:00"
+            "time": "2022-03-11T01:33:55+00:00"
         },
         {
             "name": "composer/package-versions-deprecated",
@@ -2304,6 +2308,56 @@
             },
             "time": "2021-11-05T16:50:12+00:00"
         },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
         {
             "name": "psr/log",
             "version": "1.1.4",
diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index 5cc5cbc00..81dc648bf 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -492,11 +492,7 @@ class BoardMapper extends QBMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * Reset Cache for a
-	 * given board or a given user
-	 *
-	 * @param int|null $boardId
-	 * @param int|null $userId
+	 * Reset cache for a given board or a given user
 	 */
 	public function flushCache(?int $boardId = null, ?string $userId = null)
 	{
diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php
index d09007390..ceea63519 100644
--- a/lib/Service/BoardService.php
+++ b/lib/Service/BoardService.php
@@ -729,10 +729,7 @@ class BoardService {
 	}
 
 	/**
-	 * Clean a given board data
-	 * from the Cache
-	 *
-	 * @param OCA\Deck\Db\Board $board
+	 * Clean a given board data from the Cache
 	 */
 	private function clearBoardFromCache(Board $board) {
 		$boardId = $board->getId();