diff --git a/src/common/caching.c b/src/common/caching.c
index 265d8308e..106ec61f8 100644
--- a/src/common/caching.c
+++ b/src/common/caching.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "common/io.h"
 #include "common/printing.h"
+#include "common/caching.h"
 
 #include <stdlib.h>
 
diff --git a/src/common/caching.h b/src/common/caching.h
new file mode 100644
index 000000000..9a941d04d
--- /dev/null
+++ b/src/common/caching.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_caching
+#define FF_INCLUDED_common_caching
+
+#include "fastfetch.h"
+
+typedef struct FFcache
+{
+    FILE* value;
+    FILE* split;
+} FFcache;
+
+void ffCacheValidate(FFinstance* instance);
+
+void ffCacheOpenWrite(FFinstance* instance, const char* moduleName, FFcache* cache);
+void ffCacheClose(FFcache* cache);
+
+bool ffPrintFromCache(FFinstance* instance, const char* moduleName, const FFModuleArgs* moduleArgs, uint32_t numArgs);
+void ffPrintAndAppendToCache(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFcache* cache, const FFstrbuf* value, uint32_t numArgs, const FFformatarg* arguments);
+void ffPrintAndWriteToCache(FFinstance* instance, const char* moduleName, const FFModuleArgs* moduleArgs, const FFstrbuf* value, uint32_t numArgs, const FFformatarg* arguments);
+
+void ffCachingWriteData(const FFinstance* instance, const char* moduleName, size_t dataSize, const void* data);
+bool ffCachingReadData(const FFinstance* instance, const char* moduleName, size_t dataSize, void* data);
+
+#endif
diff --git a/src/common/init.c b/src/common/init.c
index cfa0b8e66..a7fa5e4a2 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/caching.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/fastfetch.h b/src/fastfetch.h
index c607ae6fe..42f2ce5a5 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -337,12 +337,6 @@ typedef struct FFformatarg
     const void* value;
 } FFformatarg;
 
-typedef struct FFcache
-{
-    FILE* value;
-    FILE* split;
-} FFcache;
-
 typedef enum FFvarianttype
 {
     FF_VARIANT_TYPE_STRING,
@@ -385,19 +379,6 @@ void ffListFeatures();
 //common/threading.c
 void ffStartDetectionThreads(FFinstance* instance);
 
-//common/caching.c
-void ffCacheValidate(FFinstance* instance);
-
-void ffCacheOpenWrite(FFinstance* instance, const char* moduleName, FFcache* cache);
-void ffCacheClose(FFcache* cache);
-
-bool ffPrintFromCache(FFinstance* instance, const char* moduleName, const FFModuleArgs* moduleArgs, uint32_t numArgs);
-void ffPrintAndAppendToCache(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFcache* cache, const FFstrbuf* value, uint32_t numArgs, const FFformatarg* arguments);
-void ffPrintAndWriteToCache(FFinstance* instance, const char* moduleName, const FFModuleArgs* moduleArgs, const FFstrbuf* value, uint32_t numArgs, const FFformatarg* arguments);
-
-void ffCachingWriteData(const FFinstance* instance, const char* moduleName, size_t dataSize, const void* data);
-bool ffCachingReadData(const FFinstance* instance, const char* moduleName, size_t dataSize, void* data);
-
 //common/font.c
 void ffFontInitQt(FFfont* font, const char* data);
 void ffFontInitPango(FFfont* font, const char* data);
diff --git a/src/modules/cpu.c b/src/modules/cpu.c
index 134119373..1bf172600 100644
--- a/src/modules/cpu.c
+++ b/src/modules/cpu.c
@@ -2,6 +2,7 @@
 #include "common/io.h"
 #include "common/properties.h"
 #include "common/printing.h"
+#include "common/caching.h"
 
 #include <stdlib.h>
 
diff --git a/src/modules/gpu.c b/src/modules/gpu.c
index f65b2df98..9ed980aaa 100644
--- a/src/modules/gpu.c
+++ b/src/modules/gpu.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "common/caching.h"
 
 #include <stdlib.h>
 
diff --git a/src/modules/host.c b/src/modules/host.c
index 654443114..979a8cb51 100644
--- a/src/modules/host.c
+++ b/src/modules/host.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "common/caching.h"
 
 #include <stdlib.h>
 
diff --git a/src/modules/locale.c b/src/modules/locale.c
index 360c9a2f5..9d47cd405 100644
--- a/src/modules/locale.c
+++ b/src/modules/locale.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "common/properties.h"
 #include "common/printing.h"
+#include "common/caching.h"
 
 #include <stdlib.h>