diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/Headers.java b/lib/src/main/java/com/nextcloud/android/sso/api/Headers.java
new file mode 100644
index 00000000..2f09bfde
--- /dev/null
+++ b/lib/src/main/java/com/nextcloud/android/sso/api/Headers.java
@@ -0,0 +1,18 @@
+package com.nextcloud.android.sso.api;
+
+import androidx.annotation.NonNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Headers {
+    private final Map<String, String> headers = new HashMap<>();
+
+    public void put(String key, String value) {
+        headers.put(key.toLowerCase(), value);
+    }
+
+    public String get(String key) {
+        return headers.get(key.toLowerCase());
+    }
+}
diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/ParsedResponse.java b/lib/src/main/java/com/nextcloud/android/sso/api/ParsedResponse.java
index 5614e803..4c0d4657 100644
--- a/lib/src/main/java/com/nextcloud/android/sso/api/ParsedResponse.java
+++ b/lib/src/main/java/com/nextcloud/android/sso/api/ParsedResponse.java
@@ -11,12 +11,10 @@
 import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 public class ParsedResponse<T> {
     private final T response;
-    private final Map<String, String> headers = new HashMap<>();
+    private final Headers headers = new Headers();
 
     public ParsedResponse(T response, @Nullable ArrayList<AidlNetworkRequest.PlainHeader> headers) {
         this.response = response;
@@ -39,7 +37,7 @@ public T getResponse() {
         return response;
     }
 
-    public Map<String, String> getHeaders() {
+    public Headers getHeaders() {
         return headers;
     }
-}
+}
\ No newline at end of file