diff --git a/src/invidious/database/annotations.cr b/src/invidious/database/annotations.cr
new file mode 100644
index 00000000..03749473
--- /dev/null
+++ b/src/invidious/database/annotations.cr
@@ -0,0 +1,24 @@
+require "./base.cr"
+
+module Invidious::Database::Annotations
+  extend self
+
+  def insert(id : String, annotations : String)
+    request = <<-SQL
+      INSERT INTO annotations
+      VALUES ($1, $2)
+      ON CONFLICT DO NOTHING
+    SQL
+
+    PG_DB.exec(request, id, annotations)
+  end
+
+  def select(id : String) : Annotation?
+    request = <<-SQL
+      SELECT * FROM annotations
+      WHERE id = $1
+    SQL
+
+    return PG_DB.query_one?(request, id, as: Annotation)
+  end
+end
diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index 014c04a8..c5f6c6c5 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -183,7 +183,7 @@ def cache_annotation(db, id, annotations)
     end
   end
 
-  db.exec("INSERT INTO annotations VALUES ($1, $2) ON CONFLICT DO NOTHING", id, annotations) if has_legacy_annotations
+  Invidious::Database::Annotations.insert(id, annotations) if has_legacy_annotations
 end
 
 def create_notification_stream(env, topics, connection_channel)
diff --git a/src/invidious/routes/api/v1/videos.cr b/src/invidious/routes/api/v1/videos.cr
index 4c7179ce..f982329c 100644
--- a/src/invidious/routes/api/v1/videos.cr
+++ b/src/invidious/routes/api/v1/videos.cr
@@ -239,7 +239,7 @@ module Invidious::Routes::API::V1::Videos
 
     case source
     when "archive"
-      if CONFIG.cache_annotations && (cached_annotation = PG_DB.query_one?("SELECT * FROM annotations WHERE id = $1", id, as: Annotation))
+      if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id))
         annotations = cached_annotation.annotations
       else
         index = CHARS_SAFE.index(id[0]).not_nil!.to_s.rjust(2, '0')