diff --git a/scrapy/contrib/pipeline/media.py b/scrapy/contrib/pipeline/media.py
index cb1685c86..9491836d2 100644
--- a/scrapy/contrib/pipeline/media.py
+++ b/scrapy/contrib/pipeline/media.py
@@ -19,7 +19,6 @@ class MediaPipeline(object):
             self.waiting = defaultdict(list)
 
     def __init__(self, download_func=None):
-        self.spiderinfo = {}
         self.download_func = download_func
 
     @classmethod
@@ -32,13 +31,10 @@ class MediaPipeline(object):
         return pipe
 
     def open_spider(self, spider):
-        self.spiderinfo[spider] = self.SpiderInfo(spider)
-
-    def close_spider(self, spider):
-        del self.spiderinfo[spider]
+        self.spiderinfo = self.SpiderInfo(spider)
 
     def process_item(self, item, spider):
-        info = self.spiderinfo[spider]
+        info = self.spiderinfo
         requests = arg_to_iter(self.get_media_requests(item, info))
         dlist = [self._process_request(r, info) for r in requests]
         dfd = DeferredList(dlist, consumeErrors=1)
diff --git a/scrapy/tests/test_pipeline_media.py b/scrapy/tests/test_pipeline_media.py
index cf1d60683..1aff804ee 100644
--- a/scrapy/tests/test_pipeline_media.py
+++ b/scrapy/tests/test_pipeline_media.py
@@ -8,7 +8,6 @@ from scrapy.http import Request, Response
 from scrapy.spider import BaseSpider
 from scrapy.utils.request import request_fingerprint
 from scrapy.contrib.pipeline.media import MediaPipeline
-from scrapy.utils.test import get_crawler
 from scrapy.utils.signal import disconnect_all
 from scrapy import signals
 from scrapy import log
@@ -27,13 +26,12 @@ class BaseMediaPipelineTestCase(unittest.TestCase):
         self.spider = BaseSpider('media.com')
         self.pipe = self.pipeline_class(download_func=_mocked_download_func)
         self.pipe.open_spider(self.spider)
-        self.info = self.pipe.spiderinfo[self.spider]
+        self.info = self.pipe.spiderinfo
 
     def tearDown(self):
         for name, signal in vars(signals).items():
             if not name.startswith('_'):
                 disconnect_all(signal)
-        self.pipe.close_spider(self.spider)
 
     def test_default_media_to_download(self):
         request = Request('http://url')