diff --git a/includes/class-newspack.php b/includes/class-newspack.php
index 8f844d245c..8376159bd3 100644
--- a/includes/class-newspack.php
+++ b/includes/class-newspack.php
@@ -145,7 +145,6 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/class-donations.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-category-pager.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-salesforce.php';
-		include_once NEWSPACK_ABSPATH . 'includes/class-pwa.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-starter-content.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-amp-enhancements.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-newspack-image-credits.php';
@@ -160,6 +159,7 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-onesignal.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-organic-profile-block.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-perfmatters.php';
+		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-pwa.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/co-authors-plus/class-guest-contributor-role.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/co-authors-plus/class-search-authors-limit.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/wc-memberships/class-memberships.php';
diff --git a/includes/class-pwa.php b/includes/plugins/class-pwa.php
similarity index 93%
rename from includes/class-pwa.php
rename to includes/plugins/class-pwa.php
index 58fe0bcb6b..65e2434e2c 100644
--- a/includes/class-pwa.php
+++ b/includes/plugins/class-pwa.php
@@ -29,6 +29,14 @@ public static function init() {
 
 		add_action( 'wp_front_service_worker', [ __CLASS__, 'bypass_service_worker' ], 100 );
 		add_action( 'wp_admin_service_worker', [ __CLASS__, 'bypass_service_worker' ], 100 );
+
+		// Replace the SW caching header ('no-cache' by default), so it can be cached (for a day).
+		add_action(
+			'wp_front_service_worker',
+			function () {
+				header( 'Cache-Control: max-age=86400, must-revalidate' );
+			} 
+		);
 	}
 
 	/**
@@ -107,7 +115,7 @@ public static function error_messages( $messages ) {
 
 	/**
 	 * Temporary workaround to disable the offline post request handling script.
-	 * 
+	 *
 	 * @param WP_Service_Worker_Scripts $scripts The service worker scripts.
 	 *
 	 * @see - https://github.com/GoogleChromeLabs/pwa-wp/issues/1106