diff --git a/src/Helpers/Http.php b/src/Helpers/Http.php
index c31ad23..cfa7184 100644
--- a/src/Helpers/Http.php
+++ b/src/Helpers/Http.php
@@ -188,7 +188,20 @@ public static function request(string $method, string $url, $data = null, array
     }
 
     /**
-     * Alternative method using file_get_contents with stream context
+     * File get contents wrapper to handle PHP version differences in fetching headers after a request.
+     */
+    private static function fileGetContents(string $url, array $options): array {
+        if (!function_exists('http_get_last_response_headers')) {
+            require_once __DIR__.'/lib/PrePHP84Http.php';
+        } else {
+            require_once __DIR__.'/lib/PHP84Http.php';
+        }
+
+        return mchef_fetch_content($url, $options);
+    }
+
+    /**
+     * Alternative method using fileGetContents with stream context
      * Useful when cURL is not available
      */
     public static function getWithStream(string $url, array $headers = [], array $options = []): HttpResponse
@@ -219,24 +232,12 @@ public static function getWithStream(string $url, array $headers = [], array $op
             $contextOptions = array_merge_recursive($contextOptions, $options['context']);
         }
 
-        $context = stream_context_create($contextOptions);
-        $body = @file_get_contents($url, false, $context);
+        [$body, $headerLines] = self::fileGetContents($url, $contextOptions);
 
-        if ($body === false) {
-            $error = error_get_last();
-            throw new \RuntimeException("HTTP request failed: url - {$url} error - " . ($error['message'] ?? 'Unknown error'));
-        }
-
-        // Get response headers using the polyfill-compatible approach
         $responseHeaders = [];
-        $headerLines = [];
-        if (isset($http_response_header)) {
-            $GLOBALS['http_response_header'] = $http_response_header;
-        }
-        $headerLines = http_get_last_response_headers() ?? [];
 
         if (empty($headerLines)) {
-            // If no $http_response_header, it means the request completely failed
+            // If no headers were received, it means the request completely failed
             throw new \RuntimeException("No response headers received - network error for URL: {$url}");
         }
         
diff --git a/src/Helpers/lib/PHP84Http.php b/src/Helpers/lib/PHP84Http.php
new file mode 100644
index 0000000..3ae5fb4
--- /dev/null
+++ b/src/Helpers/lib/PHP84Http.php
@@ -0,0 +1,20 @@
+<?php
+
+// Deliberately no namespace here as this is included directly in Http.php for PHP 8.4 and above support
+
+/**
+ * PHP 8.4+ implementation of content fetching using file_get_contents
+ * This is used for PHP 8.4 and above where http_get_last_response_headers() is available to get headers after a request
+ */
+function mchef_fetch_content(string $url, ?array $options = null): array {
+    $context = stream_context_create($options);
+    $body = @file_get_contents($url, false, $context);
+
+    if ($body === false) {
+        $error = error_get_last();
+        throw new \RuntimeException("HTTP request failed: url - {$url} error - " . ($error['message'] ?? 'Unknown error'));
+    }
+    $headers = http_get_last_response_headers() ?? [];
+
+    return [$body, $headers];
+}
\ No newline at end of file
diff --git a/src/Helpers/lib/PrePHP84Http.php b/src/Helpers/lib/PrePHP84Http.php
new file mode 100644
index 0000000..db341c4
--- /dev/null
+++ b/src/Helpers/lib/PrePHP84Http.php
@@ -0,0 +1,20 @@
+<?php
+
+// Deliberately no namespace here as this is included directly in Http.php for PHP < 8.4 support
+
+/**
+ * PHP < 8.4 implementation of content fetching using file_get_contents
+ * This is used for PHP versions 8.3 and below where http_get_last_response_headers() is not available
+ */
+function mchef_fetch_content(string $url, ?array $options = null): array {
+    $context = stream_context_create($options);
+    $body = @file_get_contents($url, false, $context);
+
+    if ($body === false) {
+        $error = error_get_last();
+        throw new \RuntimeException("HTTP request failed: url - {$url} error - " . ($error['message'] ?? 'Unknown error'));
+    }
+    $headers = $http_response_header ?? [];
+
+    return [$body, $headers];
+}
\ No newline at end of file
diff --git a/src/Polyfills/http_get_last_response_headers.php b/src/Polyfills/http_get_last_response_headers.php
deleted file mode 100644
index 9aea67c..0000000
--- a/src/Polyfills/http_get_last_response_headers.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-// Polyfill for PHP < 8.4
-// https://www.php.net/manual/en/function.http-get-last-response-headers.php
-
-if (!function_exists('http_get_last_response_headers')) {
-    /**
-     * Returns the response headers from the last HTTP request made
-     * via the HTTP stream wrapper.
-     *
-     * @return array|null
-     */
-    function http_get_last_response_headers(): ?array {
-        /**
-         * $http_response_header is a special variable populated by
-         * the HTTP stream wrapper in the local scope of the request.
-         *
-         * In practice it is available in the global scope immediately
-         * after file_get_contents()/fopen() HTTP calls.
-         */
-        if (isset($GLOBALS['http_response_header']) && is_array($GLOBALS['http_response_header'])) {
-            return $GLOBALS['http_response_header'];
-        }
-
-        return null;
-    }
-}