diff --git a/4chan_x.js b/4chan_x.js
index 0ed28b461..cea6cf21b 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -537,32 +537,22 @@
         var thread;
         thread = this.parentNode;
         return expandThread.toggle(thread);
-      },
-      load: function(xhr, thread, a) {
-        var html, id;
-        if (xhr.status === 404) {
-          a.textContent.replace('X Loading...', '404');
-          return $.unbind(a, 'click', expandThread.cb.toggle);
-        } else {
-          html = xhr.responseText;
-          id = thread.firstChild.id;
-          g.cache[id] = html;
-          return expandThread.expand(html, thread, a);
-        }
       }
     },
     toggle: function(thread) {
-      var a, html, id, num, prev, table, _results;
-      id = thread.firstChild.id;
+      var a, num, prev, req, table, threadID, _results;
+      threadID = thread.firstChild.id;
       a = $('a.omittedposts', thread);
       switch (a.textContent[0]) {
         case '+':
           a.textContent = a.textContent.replace('+', 'X Loading...');
-          if (html = g.cache[id]) {
-            return expandThread.expand(html, thread, a);
+          if (req = g.requests[threadID]) {
+            if (req.readyState === 4) {
+              return expandThread.parse(req, thread, a);
+            }
           } else {
-            return g.requests[id] = $.get("res/" + id, (function() {
-              return expandThread.cb.load(this, thread, a);
+            return g.requests[threadID] = $.get("res/" + threadID, (function() {
+              return expandThread.parse(this, thread, a);
             }));
           }
           break;
@@ -580,15 +570,20 @@
           return _results;
       }
     },
-    expand: function(html, thread, a) {
+    parse: function(req, thread, a) {
       var body, br, next, table, tables, _i, _len, _results;
+      if (req.status !== 200) {
+        a.textContent = "" + req.status + " " + req.statusText;
+        $.unbind(a, 'click', expandThread.cb.toggle);
+        return;
+      }
       a.textContent = a.textContent.replace('X Loading...', '-');
       while ((next = a.nextSibling) && !next.clear) {
         $.rm(next);
       }
       br = next;
       body = $.el('body', {
-        innerHTML: html
+        innerHTML: req.responseText
       });
       tables = $$('form[name=delform] table', body);
       tables.pop();
diff --git a/script.coffee b/script.coffee
index 29e058890..722ab5d0b 100644
--- a/script.coffee
+++ b/script.coffee
@@ -373,28 +373,18 @@ expandThread =
       thread = @parentNode
       expandThread.toggle thread
 
-    load: (xhr, thread, a) ->
-      if xhr.status is 404
-        a.textContent.replace 'X Loading...', '404'
-        $.unbind a, 'click', expandThread.cb.toggle
-      else
-        html = xhr.responseText
-        id = thread.firstChild.id
-        g.cache[id] = html
-        expandThread.expand html, thread, a
-
   toggle: (thread) ->
-    id = thread.firstChild.id
+    threadID = thread.firstChild.id
     a = $ 'a.omittedposts', thread
 
     switch a.textContent[0]
       when '+'
         a.textContent = a.textContent.replace '+', 'X Loading...'
-        if html = g.cache[id]
-          expandThread.expand html, thread, a
+        if req = g.requests[threadID]
+          if req.readyState is 4
+            expandThread.parse req, thread, a
         else
-          g.requests[id] =
-            $.get "res/#{id}", (-> expandThread.cb.load this, thread, a)
+          g.requests[threadID] = $.get "res/#{threadID}", (-> expandThread.parse this, thread, a)
 
       when 'X'
         a.textContent = a.textContent.replace 'X Loading...', '+'
@@ -408,7 +398,12 @@ expandThread =
         while (prev = table.previousSibling) and (prev.nodeName is 'TABLE')
           $.rm prev
 
-  expand: (html, thread, a) ->
+  parse: (req, thread, a) ->
+    if req.status isnt 200
+      a.textContent = "#{req.status} #{req.statusText}"
+      $.unbind a, 'click', expandThread.cb.toggle
+      return
+
     a.textContent = a.textContent.replace 'X Loading...', '-'
 
     # eat everything, then replace with fresh full posts
@@ -417,7 +412,7 @@ expandThread =
     br = next
 
     body = $.el 'body',
-      innerHTML: html
+      innerHTML: req.responseText
 
     tables = $$ 'form[name=delform] table', body
     tables.pop()