--- pi1/class.tx_flstaticfilecache_pi1.php.orig	2006-09-28 15:14:20.281340092 +0000
+++ pi1/class.tx_flstaticfilecache_pi1.php	2006-09-28 17:52:17.829649842 +0000
@@ -34,11 +34,12 @@
    function main (&$content, $conf){
       $this->content =& $content;
       $this->conf = $conf;
-      
+
       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('tx_flstaticfilecache_cache c','pages', '`uid`='.$GLOBALS['TSFE']->page['uid']);
       $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-      if(isset($row['c']) AND trim($row['c']) == '1' AND $_SERVER['argv'] == array() AND $_POST == array() AND (str_replace("index.php", "0", $_SERVER['REQUEST_URI']) == $_SERVER['REQUEST_URI']) AND !$this->isAdmin()){
-         $url = $_SERVER['DOCUMENT_ROOT'].$_SERVER['REQUEST_URI'].'cache.html';
+      if(isset($row['c']) AND trim($row['c']) == '1' AND !isset($_GET["type"]) AND $_POST == array() AND (str_replace("index.php", "0", $_SERVER['REQUEST_URI']) == $_SERVER['REQUEST_URI']) AND !$this->isAdmin()){
+
+         $url = $_SERVER['DOCUMENT_ROOT'].$_SERVER['SCRIPT_URL'].'_'.$_SERVER["QUERY_STRING"].'_cache.html';
 
          $b = explode('/', $url);
          $pfad = $this->uploaddir;
@@ -48,7 +49,7 @@
             if($i == sizeof($b)-1){
                $fp=fopen($pfad.$b[$i],'w');
                if($fp){
-                 $this->content.= "\n\n<!-- \n\tStatic Cache File from ".date("d. F Y - H:i:s", time())."\n\tExtension fl_staticfilecache by typo3.fruit-lab.de | Tim Lochmueller \n\tBug Report to: http://typo3.fruit-lab.de/kontakt.html\n-->";
+                 $this->content.= "\n\n<!-- \n\tStatic Cache File from ".date("d. F Y - H:i:s", time())."\n\tStatic Cache File: ".$b[$i]."\n\tExtension fl_staticfilecache by typo3.fruit-lab.de | Tim Lochmueller \n\tBug Report to: http://typo3.fruit-lab.de/kontakt.html\n-->";
                  fwrite($fp,$this->content);
                  fclose($fp);
                  chmod($pfad.$b[$i], 0777);
@@ -77,4 +78,4 @@
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/fl_staticfilecache/pi1/class.tx_flstaticfilecache_pi1.php']) {
    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/fl_staticfilecache/pi1/class.tx_flstaticfilecache_pi1.php']);
 } # if
-?>
\ No newline at end of file
+?>
--- _.htaccess.orig	2006-09-28 17:54:09.280615092 +0000
+++ _.htaccess	2006-09-28 17:53:43.695016092 +0000
@@ -18,9 +18,13 @@
 ############## Static File Cache ####################
 #####################################################
 RewriteCond %{REQUEST_METHOD} GET
-RewriteCond %{QUERY_STRING} ^$
-RewriteCond %{DOCUMENT_ROOT}/uploads/tx_flstaticfilecache%{SCRIPT_FILENAME}%{PATH_INFO}cache.html -f
-RewriteRule .* %{DOCUMENT_ROOT}/uploads/tx_flstaticfilecache%{SCRIPT_FILENAME}%{PATH_INFO}cache.html [L]
+RewriteCond %{QUERY_STRING} ^(.*)$
+RewriteCond %{DOCUMENT_ROOT}/uploads/tx_flstaticfilecache%{SCRIPT_FILENAME}%{PATH_INFO}_%1_cache.html -f
+RewriteRule .* %{DOCUMENT_ROOT}/uploads/tx_flstaticfilecache%{SCRIPT_FILENAME}%{PATH_INFO}_%1_cache.html [L]
+#RewriteCond %{REQUEST_METHOD} GET
+#RewriteCond %{QUERY_STRING} ^$
+#RewriteCond %{DOCUMENT_ROOT}/uploads/tx_flstaticfilecache%{SCRIPT_FILENAME}%{PATH_INFO}cache.html -f
+#RewriteRule .* %{DOCUMENT_ROOT}/uploads/tx_flstaticfilecache%{SCRIPT_FILENAME}%{PATH_INFO}cache.html [L]
 
 
 # If the file/symlink/directory does not exist => Redirect to index.php