@@ -32,13 +32,13 @@ def construct(cls, repo, treeish, paths = []):
     def construct_initialize(self, repo, id, text):
         self.repo = repo
         self.id = id
-        self.contents = []
+        self.contents = {}
         self.__baked__ = False
 
         for line in text.splitlines():
-            self.contents.append(self.content_from_string(self.repo, line))
-
-        self.contents = [c for c in self.contents if c is not None]
+            obj = self.content_from_string(self.repo, line)
+            if obj:
+                self.contents[obj.name] = obj
 
         self.__bake_it__()
         return self
@@ -84,8 +84,7 @@ def __div__(self, file):
         Returns
             ``GitPython.Blob`` or ``GitPython.Tree`` or ``None`` if not found
         """
-        contents = [c for c in self.contents if c.name == file]
-        return contents and contents[0] or None
+        return self.contents.get(file)
 
     @property
     def basename(self):
 
@@ -96,8 +96,8 @@ def test_tree(self, git):
 
         tree = self.repo.tree('master')
 
-        assert_equal(4, len([c for c in tree.contents if isinstance(c, Blob)]))
-        assert_equal(3, len([c for c in tree.contents if isinstance(c, Tree)]))
+        assert_equal(4, len([c for c in tree.contents.values() if isinstance(c, Blob)]))
+        assert_equal(3, len([c for c in tree.contents.values() if isinstance(c, Tree)]))
 
         assert_true(git.called)
         assert_equal(git.call_args, (('ls_tree', 'master'), {}))
 
@@ -18,7 +18,7 @@ def test_contents_should_cache(self, git):
 
         tree = self.repo.tree('master')
 
-        child = tree.contents[-1]
+        child = tree.contents['grit']
         child.contents
         child.contents