diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml
index e3a39b473..9a6f2740f 100644
--- a/app/views/devise/sessions/new.haml
+++ b/app/views/devise/sessions/new.haml
@@ -20,37 +20,35 @@
       });
     });
 
-.container{:style => 'text-align:center;'}
-  #login
-    = image_tag('logo_caps.png', :id => 'logo');
-    %br
-    %br
-    = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-      %p
-        = f.label :username , t('username')
-        = f.text_field :username
-        %span.pod_location
-          ="@#{AppConfig[:pod_uri].host}"
+- cache(:login_form) do
+  .container{:style => 'text-align:center;'}
+    #login
+      = image_tag('logo_caps.png', :id => 'logo', :width => 143, :height => 21)
+      %br
+      %br
+      = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+        %p
+          = f.label :username , t('username')
+          = f.text_field :username
+          %span.pod_location
+            ="@#{AppConfig[:pod_uri].host}"
 
-      %p
-        = f.label :password , t('password')
-        = f.password_field :password
-        %span
-          - if devise_mapping.recoverable? && controller_name != 'passwords'
-            = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name)
-          - else
-            \.
-      /%p.checkbox_select
-      /- if devise_mapping.rememberable?
-      /= f.check_box :remember_me
-      /= f.label :remember_me , t('.remember_me')
-      %p.submit
-        = f.submit t('.sign_in')
-        %span
-          - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
-            = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
-          - else
-            \.
+        %p
+          = f.label :password , t('password')
+          = f.password_field :password
+          %span
+            - if devise_mapping.recoverable? && controller_name != 'passwords'
+              = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name)
+            - else
+              \.
 
-    = image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"
+        %p.submit
+          = f.submit t('.sign_in')
+          %span
+            - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
+              = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
+            - else
+              \.
+
+      = image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 3122c5840..dc973d6f1 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -88,17 +88,19 @@
 
     .clearfix
       /=render :partial => 'layouts/debug.haml'
-    %footer
-      .container
-        %ul#footer_nav
-          %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-          %li= link_to 'github', "https://github.com/diaspora/diaspora"
-          %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
-          %li= link_to t('layouts.header.code'), "#{root_url.chomp('/')}/source.tar.gz" unless request.url.match(/joindiaspora.com/)
-          %li= link_to t('.whats_new'), 'https://github.com/diaspora/diaspora/wiki/Changelog'
-        = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
-        %br
-        = link_to t('.have_a_problem'), 'http://diaspora.shapado.com/'
+
+    - cache(:footer) do
+      %footer
+        .container
+          %ul#footer_nav
+            %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
+            %li= link_to 'github', "https://github.com/diaspora/diaspora"
+            %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
+            %li= link_to t('layouts.header.code'), "#{root_url.chomp('/')}/source.tar.gz" unless request.url.match(/joindiaspora.com/)
+            %li= link_to t('.whats_new'), 'https://github.com/diaspora/diaspora/wiki/Changelog'
+          = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
+          %br
+          = link_to t('.have_a_problem'), 'http://diaspora.shapado.com/'
 
     -if !@landing_page && request.url.match(/joindiaspora.com/)
       :javascript