build(app): Additional fixes

Author: lonnieezell

system/Router/Attributes/Cache.php

@@ -69,11 +69,13 @@ public function before(RequestInterface $request): RequestInterface|ResponseInte
             $response->setStatusCode($cached['status']);
             // Mark response as served from cache to prevent re-caching
             $response->setHeader('X-Cached-Response', 'true');
+
             // Restore headers from cached array of header name => value strings
             foreach ($cached['headers'] as $name => $value) {
                 $response->setHeader($name, $value);
             }
             $response->setHeader('Age', (string) (time() - ($cached['timestamp'] ?? time())));
+
             return $response;
         }
 

tests/system/CodeIgniterTest.php

@@ -956,9 +956,12 @@ public function testStartControllerPermitsInvoke(): void
         $this->setPrivateProperty($this->codeigniter, 'benchmark', new Timer());
         $this->setPrivateProperty($this->codeigniter, 'controller', '\\' . Home::class);
 
-        // Set up the router with routes
+        // Set up the request and router
+        $request = service('incomingrequest');
+        $this->setPrivateProperty($this->codeigniter, 'request', $request);
+        
         $routes = service('routes');
-        $router = service('router', $routes, service('incomingrequest'));
+        $router = service('router', $routes, $request);
         $this->setPrivateProperty($this->codeigniter, 'router', $router);
 
         $startController = self::getPrivateMethodInvoker($this->codeigniter, 'startController');