Rewrite Store::load_in_cache() to check cache before loading

src/storage/mod.rs

@@ -60,6 +60,7 @@ impl Store {
         -> Option<Rc<RefCell<File>>>
         where HP: FileHeaderParser
     {
+        self.load(&id).or({
             let idstr : String = id.clone().into();
             let path = format!("{}/{}-{}.imag", self.storepath, m.name(), idstr);
             debug!("Loading path = '{}'", path);
@@ -72,9 +73,9 @@ impl Store {
 
             parser.read(string).map(|(header, data)| {
                 self.new_file_from_parser_result(m, id.clone(), header, data);
-        });
-
                 self.load(&id)
+            }).unwrap_or(None)
+        })
     }
 
     /**