diff --git a/app/views/profile/_person.rhtml b/app/views/profile/_person.rhtml
index 0769e58..767262c 100644
--- a/app/views/profile/_person.rhtml
+++ b/app/views/profile/_person.rhtml
@@ -4,62 +4,62 @@
 <%= display_field(_('Name:'), profile, :name) { |name| link_to name, profile.url  } %>
 <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
 <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
+<%= display_field(_('Location:'), profile, :location) %>
 
-<tr>
-  <th colspan='2'><%= _('Contact')%></th>
-</tr>
 <% if profile == user || profile.friends.include?(user) %>
+  <tr>
+    <th colspan='2'><%= _('Contact')%></th>
+  </tr>
   <%= display_field(_('Address:'), profile, :address) %>
   <%= display_field(_('ZIP code:'), profile, :zip_code) %>
   <%= display_field(_('Contact phone:'), profile, :contact_phone) %>
   <%= display_field(_('e-Mail:'), profile, :email) { |email| link_to_email(email) } %>
 <% end %>
-<%= display_field(_('Location:'), profile, :location) %>
 
-<% if !(profile.organization.blank? && profile.organization_website.blank?) %>
-<tr>
-  <th colspan='2'><%= _('Work')%></th>
-</tr>
-<% end %>
-<%= display_field(_('Organization:'), profile, :organization) %>
-<%= display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }%>
-
-
-<% if !profile.enterprises.empty? %>
-  <tr>
-    <th colspan='2'><%= __('Enterprises') %></th>
-  </tr>
-  <% profile.enterprises.each do |item| %>
+<% cache_timeout(profile.identifier + '-profile-relationships', 4.hours.from_now) do %>
+  <% if !(profile.organization.blank? && profile.organization_website.blank?) %>
     <tr>
-      <td></td>
-      <td><%= button 'menu-enterprise', item.name, item.url %></td>
+      <th colspan='2'><%= _('Work')%></th>
     </tr>
   <% end %>
-<% end %>
+  <%= display_field(_('Organization:'), profile, :organization) %>
+  <%= display_field(_('Organization website:'), profile, :organization_website) { |url| link_to(url, url) }%>
 
-<tr>
-  <th colspan='2'><%= _('Network')%></th>
-</tr>
-<tr>
-  <td></td>
-  <td><%= link_to  __('Friends') + (' (%d)' % profile.friends.count), { :controller => 'profile', :action => 'friends' } %></td>
-</tr
-<tr>
-  <td></td>
-  <td><%= link_to __('Communities') + (' (%d)' % profile.communities.count), :controller => "profile", :action => 'communities' %></td>
-</tr>
 
-  </td>
-</tr>
+  <% if !profile.enterprises.empty? %>
+    <tr>
+      <th colspan='2'><%= __('Enterprises') %></th>
+    </tr>
+    <% profile.enterprises.each do |item| %>
+      <tr>
+        <td></td>
+        <td><%= button 'menu-enterprise', item.name, item.url %></td>
+      </tr>
+    <% end %>
+  <% end %>
 
-<% if !environment.enabled?('disable_categories') && !profile.interests.empty? %>
   <tr>
-    <th colspan='2'><%= _('Interests') %></th>
+    <th colspan='2'><%= _('Network')%></th>
+  </tr>
+  <tr>
+    <td></td>
+    <td><%= link_to  __('Friends') + (' (%d)' % profile.friends.count), { :controller => 'profile', :action => 'friends' } %></td>
   </tr>
-  <% profile.interests.each do |item| %>
+  <tr>
+    <td></td>
+    <td><%= link_to __('Communities') + (' (%d)' % profile.communities.count), :controller => "profile", :action => 'communities' %></td>
+  </tr>
+
+  <% if !environment.enabled?('disable_categories') && !profile.interests.empty? %>
     <tr>
-      <td></td>
-      <td><%= link_to item.name, :controller => 'search', :action => 'category_index', :category_path => item.explode_path %></td>
+      <th colspan='2'><%= _('Interests') %></th>
     </tr>
+    <% profile.interests.each do |item| %>
+      <tr>
+        <td></td>
+        <td><%= link_to item.name, :controller => 'search', :action => 'category_index', :category_path => item.explode_path %></td>
+      </tr>
+    <% end %>
   <% end %>
+
 <% end %>
diff --git a/app/views/profile/index.rhtml b/app/views/profile/index.rhtml
index cf95000..481b494 100644
--- a/app/views/profile/index.rhtml
+++ b/app/views/profile/index.rhtml
@@ -4,31 +4,31 @@
   </div>
 <% end %>
 
-<% cache_timeout(profile.identifier + '-profile', 30.minutes.from_now) do %>
 <h1><%= _("%s's profile") % profile.name %></h1>
 
 <table class='profile'>
   <%= render :partial => partial_for_class(profile.class) %>
-  <tr>
-    <th colspan='2'>
-      <%= _('Content') %>
-    </th>
-  </tr>
-  <tr>
-    <td>
-      <%= _('Content published:') %>
-    </td>
-    <td>
-      <%= link_to _('Site map'), :controller => 'profile', :action => 'sitemap' %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= _('Tags:') %>
-    </td>
-    <td>
-      <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
-    </td>
-  </tr>
+  <% cache_timeout(profile.identifier + '-profile-general-info', 4.hours.from_now) do %>
+    <tr>
+      <th colspan='2'>
+        <%= _('Content') %>
+      </th>
+    </tr>
+    <tr>
+      <td>
+        <%= _('Content published:') %>
+      </td>
+      <td>
+        <%= link_to _('Site map'), :controller => 'profile', :action => 'sitemap' %>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <%= _('Tags:') %>
+      </td>
+      <td>
+        <%= tag_cloud @tags, :id, { :action => 'tag' }, :max_size => 18, :min_size => 10%>
+      </td>
+    </tr>
+  <% end %>
 </table>
-<% end %>
--
libgit2 0.21.2