diff --git a/mautrix_telegram/commands/handler.py b/mautrix_telegram/commands/handler.py
index a6741d9c..61e16874 100644
--- a/mautrix_telegram/commands/handler.py
+++ b/mautrix_telegram/commands/handler.py
@@ -22,14 +22,13 @@ from mautrix.types import RoomID, EventID, MessageEventContent
 from mautrix.bridge.commands import (HelpSection, CommandEvent as BaseCommandEvent,
                                      CommandHandler as BaseCommandHandler,
                                      CommandProcessor as BaseCommandProcessor,
-                                     CommandHandlerFunc, command_handler as base_command_handler,
-                                     HelpCacheKey as BaseHelpCacheKey)
+                                     CommandHandlerFunc, command_handler as base_command_handler)
 
 from ..util import format_duration
 from .. import user as u, context as c, portal as po
 
 
-class HelpCacheKey(BaseHelpCacheKey, NamedTuple):
+class HelpCacheKey(NamedTuple):
     is_management: bool
     is_portal: bool
     puppet_whitelisted: bool
diff --git a/requirements.txt b/requirements.txt
index 83720268..d9c76231 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,6 @@ python-magic>=0.4,<0.5
 commonmark>=0.8,<0.10
 aiohttp>=3,<3.7
 yarl<1.6
-mautrix==0.8.0.beta9
+mautrix==0.8.0.beta10
 telethon>=1.17,<1.18
 telethon-session-sqlalchemy>=0.2.14,<0.3
diff --git a/setup.py b/setup.py
index 7e2ec3b7..068c3515 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setuptools.setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
     package_data={"mautrix_telegram": [
         "web/public/*.mako", "web/public/*.png", "web/public/*.css",