diff --git a/ChangeLog b/ChangeLog
index 681e9818..ab688c2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@ would be on top.
 
 * Added update of size on file changing in editor.
 
+* Removed cache control of fs resour
+
 
 2012.03.01, Version 0.1.9
 
diff --git a/json/config.json b/json/config.json
index da867bf8..2c46b714 100644
--- a/json/config.json
+++ b/json/config.json
@@ -7,7 +7,7 @@
         "html"  : true,
         "img"   : true
     },
-    "cache"                 : false,
+    "cache"                 : true,
     "logs"                  : false,
     "show_keys_panel"       : true,
     "server"                : true,
diff --git a/lib/server.js b/lib/server.js
index 9fa5a7d1..f197b395 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -194,15 +194,13 @@
                     
                     main.sendFile({
                         name        : lSendName,
+                        cache       : lConfig.cache,
                         gzip        : true,
                         request     : pReq,
                         response    : pRes
                     });
             }, function(pCallBack){
                 Minify.optimize(lName, {
-                    gzip        : true,
-                    request     : pReq,
-                    response    : pRes,
                     callback    : pCallBack,
                     returnName  : true
                 });
diff --git a/lib/server/main.js b/lib/server/main.js
index 3aca2373..3a71141e 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -192,7 +192,6 @@
             
             
             lRet = {
-                'Access-Control-Allow-Origin': '*',
                 'Content-Type': lType + lContentEncoding,
                 'last-modified': new Date().toString(),
                 'Vary': 'Accept-Encoding'
@@ -233,6 +232,7 @@
             
             p.response.writeHead(OK, generateHeaders({
                 name    : p.name,
+                cache   : p.cache,
                 gzip    : lGzip,
                 query   : getQuery(p.request)
             }) );
@@ -271,6 +271,7 @@
                 lGzip       = isGZIP(p.request),
                 lHead       = generateHeaders({
                     name    : p.name,
+                    cache   : p.cache,
                     gzip    : lGzip,
                     query   : lQuery
                 });