diff --git a/set_version.sh b/set_version.sh
index 23f0096a38cfa4c1319fbf7ad2152d427c768a72..40cde68ab70036782e5c984e4e8c8888b159070d 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-export version=0.5.1-alpha.20
+export version=0.5.1-alpha.21
 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/routes/users/get_default_avatar.rs b/src/routes/users/get_default_avatar.rs
index 4e46c7311428eee013c8f1503646b423e73b33a8..d2504cf1a6601a2a9abfe4fff12f48c96b76bdc3 100644
--- a/src/routes/users/get_default_avatar.rs
+++ b/src/routes/users/get_default_avatar.rs
@@ -1,28 +1,41 @@
-use rocket::response::NamedFile;
+use rocket::{Request, Response};
+use rocket::response::{self, NamedFile, Responder};
 use std::path::Path;
 
 use crate::database::Ref;
 
+pub struct CachedFile(NamedFile);
+
+pub static CACHE_CONTROL: &'static str = "public, max-age=31536000, immutable";
+
+impl<'r> Responder<'r, 'static> for CachedFile {
+    fn respond_to(self, req: &'r Request<'_>) -> response::Result<'static> {
+        Response::build_from(self.0.respond_to(req)?)
+            .raw_header("Cache-control", CACHE_CONTROL)
+            .ok()
+    }
+}
+
 #[get("/<target>/default_avatar")]
-pub async fn req(target: Ref) -> Option<NamedFile> {
+pub async fn req(target: Ref) -> Option<CachedFile> {
     match target.id.chars().nth(25).unwrap() {
         '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' => {
-            NamedFile::open(Path::new("assets/user_red.png")).await.ok()
+            NamedFile::open(Path::new("assets/user_red.png")).await.ok().map(|n| CachedFile(n))
         }
         '8' | '9' | 'A' | 'C' | 'B' | 'D' | 'E' | 'F' => {
             NamedFile::open(Path::new("assets/user_green.png"))
                 .await
-                .ok()
+                .ok().map(|n| CachedFile(n))
         }
         'G' | 'H' | 'J' | 'K' | 'M' | 'N' | 'P' | 'Q' => {
             NamedFile::open(Path::new("assets/user_blue.png"))
                 .await
-                .ok()
+                .ok().map(|n| CachedFile(n))
         }
         'R' | 'S' | 'T' | 'V' | 'W' | 'X' | 'Y' | 'Z' => {
             NamedFile::open(Path::new("assets/user_yellow.png"))
                 .await
-                .ok()
+                .ok().map(|n| CachedFile(n))
         }
         _ => unreachable!(),
     }
diff --git a/src/version.rs b/src/version.rs
index a16194be9e54694aaf70c09f98ea19bb41a779ff..c7d448d5141e4f3b0ada13801c555365ea4f2bc6 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.1-alpha.20";
+pub const VERSION: &str = "0.5.1-alpha.21";