<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -19,7 +19,8 @@ class AttachmentsController &lt; ApplicationController
 private
 
   def find_message_and_check_read_access
-    @message = Rails.cache.fetch('message_'+params[:id]) {Message.published.find(params[:id])}
+    @message = Message.published.find(params[:id])
+    # Rails.cache.fetch('message_'+params[:id]) {Message.published.find(params[:id])}
     unless (logged_in? &amp;&amp; @message.conversation.readable_by?(current_user)) || !@message.conversation.private?
       flash[:error] = &quot;Sorry, this attachment is unavailable.&quot;
       redirect_to root_path</diff>
      <filename>app/controllers/attachments_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -83,7 +83,7 @@ class MessagesController &lt; ApplicationController
     @message = @conversation.messages.new(params[:message])
     respond_to do |format|
       if current_user.messages &lt;&lt; @message
-        cache_message(@message)
+        # cache_message(@message)
         format.html { redirect_to(conversation_path(@conversation)) }
         format.xml {
           @message.send_to_msg_broker
@@ -154,13 +154,15 @@ private
     data = []
     messages.group_by(&amp;:date).each do |date, grouped_messages|
       group = { :date =&gt; date }
-      group.merge!({ :messages =&gt; grouped_messages.map { |message| cache_message(message); message.data_for_templates } })
+      # group.merge!({ :messages =&gt; grouped_messages.map { |message| cache_message(message); message.data_for_templates } })
+      group.merge!({ :messages =&gt; grouped_messages.map { |message| message.data_for_templates } })
+  
       data &lt;&lt; group
     end
     return data
   end
 
-  def cache_message(message)
-    Rails.cache.write(&quot;message_#{message.id}&quot;, message, :unless_exist =&gt; true) unless message.attachment_type == 'unknow'
-  end
+  # def cache_message(message)
+  #   Rails.cache.write(&quot;message_#{message.id}&quot;, message, :unless_exist =&gt; true) unless message.attachment_type == 'unknow'
+  # end
 end</diff>
      <filename>app/controllers/messages_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -93,7 +93,8 @@ Rails::Initializer.run do |config|
   config.action_mailer.perform_deliveries = :true
   config.action_mailer.raise_delivery_errors = :true
   config.action_mailer.default_charset = &quot;utf-8&quot;
-  config.cache_store = :memory_store
+  #config.cache_store = :memory_store
+  config.cache_store = :mem_cache_store
 end
 
 ActiveSupport::JSON.backend = 'JSONGem'</diff>
      <filename>config/environment.rb-sample</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>44252a478f7f772407f740e82867048c0b25d8d6</id>
    </parent>
  </parents>
  <author>
    <name>dmitryame</name>
    <email>dmitry@custommode.com</email>
  </author>
  <url>http://github.com/dmitryame/echowaves/commit/2d8579fb420c5f9b35c31effee7d3af52e06b2c1</url>
  <id>2d8579fb420c5f9b35c31effee7d3af52e06b2c1</id>
  <committed-date>2009-11-09T15:09:04-08:00</committed-date>
  <authored-date>2009-11-09T15:09:04-08:00</authored-date>
  <message>reverting caching for now, still troubleshooting</message>
  <tree>9a9298a68da633a2dd1ebb9b3c3d3bcc9747603b</tree>
  <committer>
    <name>dmitryame</name>
    <email>dmitry@custommode.com</email>
  </committer>
</commit>
