diff --git a/src/common/kiwix/manager.h b/src/common/kiwix/manager.h
index d3f738cd2..a38b7b0aa 100644
--- a/src/common/kiwix/manager.h
+++ b/src/common/kiwix/manager.h
@@ -20,7 +20,6 @@
 #ifndef KIWIX_MANAGER_H
 #define KIWIX_MANAGER_H
 
-#include <map>
 #include <string>
 #include <sstream>
 #include <time.h>
diff --git a/src/common/regexTools.cpp b/src/common/regexTools.cpp
index 6413a2190..202c55821 100644
--- a/src/common/regexTools.cpp
+++ b/src/common/regexTools.cpp
@@ -19,12 +19,33 @@
 
 #include "regexTools.h"
 
-bool matchRegex(const std::string &content, const std::string regex) {
-  regex_t regexp;
-  bool result = false;
+std::map<std::string, regex_t> regexCache;
+
+regex_t buildRegex(const std::string &regex) {
+  regex_t regexStruct;
+  std::map<std::string, regex_t>::iterator itr = regexCache.find(regex);
   
-  regcomp(&regexp, regex.data(), REG_ICASE);
-  result = !regexec(&regexp, content.data(), 0, 0, 0);
-  regfree(&regexp);
+  /* Regex is in cache */
+  if (itr != regexCache.end()) {
+    regexStruct = itr->second;
+  }
+
+  /* Regex needs to be parsed (and cached) */
+  else {
+    regcomp(&regexStruct, regex.data(), REG_ICASE);
+    regexCache[regex] = regexStruct;
+  }
+
+  return regexStruct;
+}
+
+/* todo */
+void freeRegexCache() {
+  //regfree(&regexStructure);
+}
+
+bool matchRegex(const std::string &content, const std::string &regex) {
+  regex_t regexStructure = buildRegex(regex);
+  bool result = !regexec(&regexStructure, content.data(), 0, 0, 0);
   return result;
 }
diff --git a/src/common/regexTools.h b/src/common/regexTools.h
index e43b79b8d..3e4443d10 100644
--- a/src/common/regexTools.h
+++ b/src/common/regexTools.h
@@ -23,7 +23,8 @@
 #include <regex.h>
 #include <string>
 #include <iostream>
+#include <map>
 
-bool matchRegex(const std::string &content, const std::string regex);
+bool matchRegex(const std::string &content, const std::string &regex);
 
 #endif