diff --git a/core/server/web/shared/middlewares/serve-public-file.js b/core/server/web/shared/middlewares/serve-public-file.js
index 000fe791c8..f9178dcf5d 100644
--- a/core/server/web/shared/middlewares/serve-public-file.js
+++ b/core/server/web/shared/middlewares/serve-public-file.js
@@ -4,9 +4,7 @@ const path = require('path');
 const config = require('../../../config');
 const urlService = require('../../../services/url');
 
-// ### servePublicFile Middleware
-// Handles requests to robots.txt and favicon.ico (and caches them)
-function servePublicFile(file, type, maxAge) {
+function createPublicFileMiddleware(file, type, maxAge) {
     let content;
     const publicFilePath = config.get('paths').publicFilePath;
     const filePath = file.match(/^public/) ? path.join(publicFilePath, file.replace(/^public/, '')) : path.join(publicFilePath, file);
@@ -14,33 +12,45 @@ function servePublicFile(file, type, maxAge) {
     const apiRegex = /(\{\{api-url\}\})/g;
 
     return function servePublicFile(req, res, next) {
-        if (req.path === '/' + file) {
-            if (content) {
-                res.writeHead(200, content.headers);
-                res.end(content.body);
-            } else {
-                fs.readFile(filePath, (err, buf) => {
-                    if (err) {
-                        return next(err);
-                    }
-
-                    if (type === 'text/xsl' || type === 'text/plain' || type === 'application/javascript') {
-                        buf = buf.toString().replace(blogRegex, urlService.utils.urlFor('home', true).replace(/\/$/, ''));
-                        buf = buf.toString().replace(apiRegex, urlService.utils.urlFor('api', {cors: true, version: 'v0.1', versionType: 'content'}, true));
-                    }
-                    content = {
-                        headers: {
-                            'Content-Type': type,
-                            'Content-Length': buf.length,
-                            ETag: `"${crypto.createHash('md5').update(buf, 'utf8').digest('hex')}"`,
-                            'Cache-Control': `public, max-age=${maxAge}`
-                        },
-                        body: buf
-                    };
-                    res.writeHead(200, content.headers);
-                    res.end(content.body);
-                });
+        if (content) {
+            res.writeHead(200, content.headers);
+            return res.end(content.body);
+        }
+        fs.readFile(filePath, (err, buf) => {
+            if (err) {
+                return next(err);
             }
+
+            let str = buf.toString();
+
+            if (type === 'text/xsl' || type === 'text/plain' || type === 'application/javascript') {
+                str = str.replace(blogRegex, urlService.utils.urlFor('home', true).replace(/\/$/, ''));
+                str = str.replace(apiRegex, urlService.utils.urlFor('api', {cors: true, version: 'v0.1', versionType: 'content'}, true));
+            }
+
+            content = {
+                headers: {
+                    'Content-Type': type,
+                    'Content-Length': Buffer.from(str).length,
+                    ETag: `"${crypto.createHash('md5').update(str, 'utf8').digest('hex')}"`,
+                    'Cache-Control': `public, max-age=${maxAge}`
+                },
+                body: str
+            };
+            res.writeHead(200, content.headers);
+            res.end(content.body);
+        });
+    };
+}
+
+// ### servePublicFile Middleware
+// Handles requests to robots.txt and favicon.ico (and caches them)
+function servePublicFile(file, type, maxAge) {
+    const publicFileMiddleware = createPublicFileMiddleware(file, type, maxAge);
+
+    return function servePublicFile(req, res, next) {
+        if (req.path === '/' + file) {
+            return publicFileMiddleware(req, res, next);
         } else {
             return next();
         }
@@ -48,3 +58,5 @@ function servePublicFile(file, type, maxAge) {
 }
 
 module.exports = servePublicFile;
+module.exports.servePublicFile = servePublicFile;
+module.exports.createPublicFileMiddleware = createPublicFileMiddleware;