diff --git a/lib/base.php b/lib/base.php
index 1c9aaaf7b01..d575c970d28 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -716,6 +716,7 @@ class OC {
 		self::registerEncryptionWrapper();
 		self::registerEncryptionHooks();
 		self::registerAccountHooks();
+		self::registerResourceCollectionHooks();
 
 		// Make sure that the application class is not loaded before the database is setup
 		if ($systemConfig->getValue("installed", false)) {
@@ -847,6 +848,10 @@ class OC {
 		\OCP\Util::connectHook('OC_User', 'changeUser', $hookHandler, 'changeUserHook');
 	}
 
+	private static function registerResourceCollectionHooks() {
+		\OC\Collaboration\Resources\Listener::register(\OC::$server->getEventDispatcher());
+	}
+
 	/**
 	 * register hooks for the filesystem
 	 */
diff --git a/lib/private/Collaboration/Resources/Listener.php b/lib/private/Collaboration/Resources/Listener.php
new file mode 100644
index 00000000000..0b190530d5d
--- /dev/null
+++ b/lib/private/Collaboration/Resources/Listener.php
@@ -0,0 +1,66 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Collaboration\Resources;
+
+
+use OCP\Collaboration\Resources\IManager;
+use OCP\IGroup;
+use OCP\IUser;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\GenericEvent;
+
+class Listener {
+
+	public static function register(EventDispatcherInterface $dispatcher): void {
+		$listener = function(GenericEvent $event) {
+			/** @var IUser $user */
+			$user = $event->getArgument('user');
+			/** @var IManager $resourceManager */
+			$resourceManager = \OC::$server->query(IManager::class);
+
+			$resourceManager->invalidateAccessCacheForUser($user);
+		};
+		$dispatcher->addListener(IGroup::class . '::postAddUser', $listener);
+		$dispatcher->addListener(IGroup::class . '::postRemoveUser', $listener);
+
+		$dispatcher->addListener(IGroup::class . '::postDelete', function(GenericEvent $event) {
+			/** @var IUser $user */
+			$user = $event->getSubject();
+			/** @var IManager $resourceManager */
+			$resourceManager = \OC::$server->query(IManager::class);
+
+			$resourceManager->invalidateAccessCacheForUser($user);
+		});
+
+		$dispatcher->addListener(IGroup::class . '::preDelete', function(GenericEvent $event) {
+			/** @var IGroup $group */
+			$group = $event->getSubject();
+			/** @var IManager $resourceManager */
+			$resourceManager = \OC::$server->query(IManager::class);
+
+			foreach ($group->getUsers() as $user) {
+				$resourceManager->invalidateAccessCacheForUser($user);
+			}
+		});
+	}
+}