diff --git a/ethcore/light/src/client/header_chain.rs b/ethcore/light/src/client/header_chain.rs
index 340488297..71c0aa314 100644
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -365,19 +365,24 @@ impl HeaderChain {
 	/// will be returned.
 	pub fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
 		let load_from_db = |hash: H256| {
-			let cached = {
-				let mut cache = self.cache.lock();
-				cache.block_header(&hash)
-			};
+			let mut cache = self.cache.lock();
+			let header = cache.block_header(&hash);
 
-			if cached.is_some() {
-				return cached
-			} else {
-				match self.db.get(self.col, &hash) {
-					Ok(val) => val.map(|x| x.to_vec()).map(encoded::Header::new),
-					Err(e) => {
-						warn!(target: "chain", "Failed to read from database: {}", e);
-						None
+			match header {
+				Some(header) => Some(header),
+				None => {
+					match self.db.get(self.col, &hash) {
+						Ok(dbValue) => {
+							dbValue.map(|x| x.to_vec()).map(encoded::Header::new)
+								.and_then(|header| {
+									cache.insert_block_header(hash.clone(), header.clone());
+									Some(header)
+								 })
+						},
+						Err(e) => {
+							warn!(target: "chain", "Failed to read from database: {}", e);
+							None
+						}
 					}
 				}
 			}
@@ -423,7 +428,7 @@ impl HeaderChain {
 		}
 	}
 
-	/// Get the nth CHT root, if it has been computed.
+	/// Get the nth CHT root, if it's been computed.
 	///
 	/// CHT root 0 is from block `1..2048`.
 	/// CHT root 1 is from block `2049..4096`