Index: /Users/mh/Documents/workspace/7.3/server/Slim/Web/HTTP.pm
===================================================================
--- /Users/mh/Documents/workspace/7.3/server/Slim/Web/HTTP.pm	(revision 22811)
+++ /Users/mh/Documents/workspace/7.3/server/Slim/Web/HTTP.pm	(working copy)
@@ -1070,11 +1070,18 @@
 	}
 
 	# this might do well to break up into methods
-	if ($contentType =~ /(?:image|javascript|css)/) {
+	if ($contentType =~ /(?:image|javascript|css)/ || $path =~ /html\//) {
 
+		my $max = 60 * 60;
+		
+		# increase expiry to a week for static content
+		unless ($contentType =~ /image/ && $path !~ /html\//) {
+			$max = $max * 24 * 7;
+		}
+		
 		# static content should expire from cache in one hour
-		$response->expires( time() + 3600 );
-		$response->header('Cache-Control' => 'max-age=3600');
+		$response->expires( time() + $max );
+		$response->header('Cache-Control' => 'max-age=' . $max);
 	}
 
 	if ($contentType =~ /text/ && $path !~ /memoryusage/) {