diff --git a/indefero/src/IDF/Conf.php b/indefero/src/IDF/Conf.php
index 90ad871..dd30438 100644
--- a/indefero/src/IDF/Conf.php
+++ b/indefero/src/IDF/Conf.php
@@ -108,6 +108,7 @@ class IDF_Conf extends Pluf_Model
         $conf->vdesc = $value;
         $conf->create();
         $this->initCache();
+        $this->_project->invalidateConfCache();
     }
 
     function getVal($key, $default='')
diff --git a/indefero/src/IDF/Project.php b/indefero/src/IDF/Project.php
index 0063a1e..863e2a2 100644
--- a/indefero/src/IDF/Project.php
+++ b/indefero/src/IDF/Project.php
@@ -161,6 +161,14 @@ class IDF_Project extends Pluf_Model
         );
     }
 
+    public function invalidateConfCache() {
+        $cache = Pluf_Cache::factory();
+        $keys = $this->getConf()->getKeys();
+        foreach($keys as $key) {
+            $cache->set("confCache" . $this->id . $key, null);
+        }
+    }
+
 
     /**
      * String representation of the abstract.
@@ -670,7 +678,14 @@ GROUP BY uid";
             return parent::__get($key);
         }
         catch (Exception $e) {
-            return $this->getConf()->getVal($key);
+            $cache = Pluf_Cache::factory();
+            if (null === ($confCache = $cache->get("confCache" . $this->id . $key, null))) {
+                $confCache = $this->getConf()->getVal($key);
+                $cache->set("confCache" . $this->id . $key, $confCache);
+                return $confCache;
+            } else {
+                return $confCache;
+            }
         }
     }
 
diff --git a/indefero/src/IDF/templates/idf/main-menu.html b/indefero/src/IDF/templates/idf/main-menu.html
index 0771abf..5442572 100644
--- a/indefero/src/IDF/templates/idf/main-menu.html
+++ b/indefero/src/IDF/templates/idf/main-menu.html
@@ -10,14 +10,17 @@
 {/if}{if $customForgePageEnabled}
 <li><a href="{url 'IDF_Views::index'}">{trans 'Home'}</a></li>
 {/if}<li id="project-list"><a href="{url 'IDF_Views::listProjects'}">{trans 'Project List'} &#x25be;</a>
-{if $allProjects.count() != 0}
 
+{if $allProjects.count() != 0}
 <ul class="prjlistclass">
     <li id="searchkeep"><input size="15" type="text" id="prjname" name="prjname" placeholder="Project Name..." /></li>
     {foreach $allProjects as $p}
-<li class="projectitem"><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><img src="{media '/idf/img/no_logo.png'}" data-logo="{$p.logo}" class="logo" data-src="{url 'IDF_Views_Project::logo64', array($p.shortname)}" alt="{trans 'Project logo'}" />{if $p.private}<img class="lock" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />{/if}{$p}</a></li>
-{/foreach}</ul>
-{/if}</li>{if $isAdmin}<li><a href="{url 'IDF_Views_Admin::forge'}">{trans 'Forge Management'} {if $pendingProjects > 0}({$pendingProjects}){/if}</a></li>{/if}<li>
+        <li class="projectitem"><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><img src="{media '/idf/img/no_logo.png'}" data-logo="{$p.logo}" class="logo" data-src="{url 'IDF_Views_Project::logo64', array($p.shortname)}" alt="{trans 'Project logo'}" />{if $p.private}<img class="lock" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />{/if}{$p}</a></li>
+    {/foreach}
+</ul>
+{/if}
+
+</li>{if $isAdmin}<li><a href="{url 'IDF_Views_Admin::forge'}">{trans 'Forge Management'} {if $pendingProjects > 0}({$pendingProjects}){/if}</a></li>{/if}<li>
 <a href="{url 'IDF_Views::faq'}" title="{trans 'Help and accessibility features'}">{trans 'Help'}</a></li>
 </ul>