diff --git a/src/database/upgrade.c b/src/database/upgrade.c
index ecc9c9f223a5403ea15d345ce691ea35931f7c53..79c8b0e483708e468c6a2a238dc6f95ba0f778ec 100644
--- a/src/database/upgrade.c
+++ b/src/database/upgrade.c
@@ -36,40 +36,77 @@ struct sql_table_description {
     })
 
 static struct sql_table_description sql_tables_list[] = {
-    DCL_SQL_TABLE(kara, DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("song_name", ALPHA),
-                  DCL_SQL_FIELD("source_name", ALPHA), DCL_SQL_FIELD("category", ALPHA),
-                  DCL_SQL_FIELD("song_type", ALPHA), DCL_SQL_FIELD("song_number", ALPHA),
-                  DCL_SQL_FIELD("language", ALPHA), DCL_SQL_FIELD("file_path", ALPHA),
-                  DCL_SQL_FIELD("is_new", ALPHA), DCL_SQL_FIELD("author_name", ALPHA),
-                  DCL_SQL_FIELD("available", ALPHA), DCL_SQL_FIELD("repo_timestamp", MK_7_3)),
-
-    DCL_SQL_TABLE(kara_type, DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("name", ALPHA)),
-    DCL_SQL_TABLE(kara_category, DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("name", ALPHA)),
-    DCL_SQL_TABLE(language, DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("name", ALPHA)),
-
-    DCL_SQL_TABLE(playlist, DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("name", ALPHA),
-                  DCL_SQL_FIELD("last_update", ALPHA)),
-
-    DCL_SQL_TABLE(kara_playlist, DCL_SQL_FIELD("kara_id", ALPHA),
-                  DCL_SQL_FIELD("playlist_id", ALPHA)),
-
-    DCL_SQL_TABLE(queue, DCL_SQL_FIELD("position", ALPHA), DCL_SQL_FIELD("kara_id", ALPHA),
-                  DCL_SQL_FIELD("priority", ALPHA)),
-
-    DCL_SQL_TABLE(users, DCL_SQL_FIELD("username", ALPHA), DCL_SQL_FIELD("password", ALPHA)),
-    DCL_SQL_TABLE(updates, DCL_SQL_FIELD("job", ALPHA), DCL_SQL_FIELD("kara_id", ALPHA)),
-
-    DCL_SQL_TABLE(misc, DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("last_update", ALPHA),
-                  DCL_SQL_FIELD("last_end_update", ALPHA), DCL_SQL_FIELD("update_job", ALPHA),
-                  DCL_SQL_FIELD("opened", ALPHA), DCL_SQL_FIELD("obfuscation", ALPHA)),
-
-    DCL_SQL_TABLE('stickers', DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("name", ALPHA)),
-
-    DCL_SQL_TABLE('stickers.kara', DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("sticker", ALPHA),
-                  DCL_SQL_FIELD("value", ALPHA)),
-
-    DCL_SQL_TABLE('stickers.plt', DCL_SQL_FIELD("id", ALPHA), DCL_SQL_FIELD("sticker", ALPHA),
-                  DCL_SQL_FIELD("value", ALPHA)),
+    DCL_SQL_TABLE(kara,                                       //
+                  DCL_SQL_FIELD("id", ALPHA),                 //
+                  DCL_SQL_FIELD("song_name", ALPHA),          //
+                  DCL_SQL_FIELD("source_name", ALPHA),        //
+                  DCL_SQL_FIELD("category", ALPHA),           //
+                  DCL_SQL_FIELD("song_type", ALPHA),          //
+                  DCL_SQL_FIELD("song_number", ALPHA),        //
+                  DCL_SQL_FIELD("language", ALPHA),           //
+                  DCL_SQL_FIELD("file_path", ALPHA),          //
+                  DCL_SQL_FIELD("is_new", ALPHA),             //
+                  DCL_SQL_FIELD("author_name", ALPHA),        //
+                  DCL_SQL_FIELD("available", ALPHA),          //
+                  DCL_SQL_FIELD("cached_mtime", MK_7_2),      //
+                  DCL_SQL_FIELD("cached_cached_dur", MK_7_2), //
+                  DCL_SQL_FIELD("repo_timestamp", MK_7_3)),   //
+
+    DCL_SQL_TABLE(kara_type,                     //
+                  DCL_SQL_FIELD("id", ALPHA),    //
+                  DCL_SQL_FIELD("name", ALPHA)), //
+
+    DCL_SQL_TABLE(kara_category,                 //
+                  DCL_SQL_FIELD("id", ALPHA),    //
+                  DCL_SQL_FIELD("name", ALPHA)), //
+
+    DCL_SQL_TABLE(language,                      //
+                  DCL_SQL_FIELD("id", ALPHA),    //
+                  DCL_SQL_FIELD("name", ALPHA)), //
+
+    DCL_SQL_TABLE(playlist,                             //
+                  DCL_SQL_FIELD("id", ALPHA),           //
+                  DCL_SQL_FIELD("name", ALPHA),         //
+                  DCL_SQL_FIELD("last_update", ALPHA)), //
+
+    DCL_SQL_TABLE(kara_playlist,                        //
+                  DCL_SQL_FIELD("kara_id", ALPHA),      //
+                  DCL_SQL_FIELD("playlist_id", ALPHA)), //
+
+    DCL_SQL_TABLE(queue,                             //
+                  DCL_SQL_FIELD("position", ALPHA),  //
+                  DCL_SQL_FIELD("kara_id", ALPHA),   //
+                  DCL_SQL_FIELD("priority", ALPHA)), //
+
+    DCL_SQL_TABLE(users,                             //
+                  DCL_SQL_FIELD("username", ALPHA),  //
+                  DCL_SQL_FIELD("password", ALPHA)), //
+
+    DCL_SQL_TABLE(updates,                          //
+                  DCL_SQL_FIELD("job", ALPHA),      //
+                  DCL_SQL_FIELD("kara_id", ALPHA)), //
+
+    DCL_SQL_TABLE(misc,                                    //
+                  DCL_SQL_FIELD("id", ALPHA),              //
+                  DCL_SQL_FIELD("last_update", ALPHA),     //
+                  DCL_SQL_FIELD("last_end_update", ALPHA), //
+                  DCL_SQL_FIELD("update_job", ALPHA),      //
+                  DCL_SQL_FIELD("opened", ALPHA),          //
+                  DCL_SQL_FIELD("obfuscation", ALPHA)),    //
+
+    DCL_SQL_TABLE('stickers',                    //
+                  DCL_SQL_FIELD("id", ALPHA),    //
+                  DCL_SQL_FIELD("name", ALPHA)), //
+
+    DCL_SQL_TABLE('stickers.kara',                 //
+                  DCL_SQL_FIELD("id", ALPHA),      //
+                  DCL_SQL_FIELD("sticker", ALPHA), //
+                  DCL_SQL_FIELD("value", ALPHA)),  //
+
+    DCL_SQL_TABLE('stickers.plt',                  //
+                  DCL_SQL_FIELD("id", ALPHA),      //
+                  DCL_SQL_FIELD("sticker", ALPHA), //
+                  DCL_SQL_FIELD("value", ALPHA)),  //
 };
 static size_t sql_tables_list_count =
     sizeof(sql_tables_list) / sizeof(struct sql_table_description);