diff --git a/Cargo.lock b/Cargo.lock
index ea6f0438d..f7e9a95dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1067,7 +1067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "rocksdb"
 version = "0.4.5"
-source = "git+https://github.com/ethcore/rust-rocksdb#9be41e05923616dfa28741c58b22776d479751e6"
+source = "git+https://github.com/ethcore/rust-rocksdb#6472a9dce16c267a3acec2ee6fd01d1bf8de4913"
 dependencies = [
  "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocksdb-sys 0.3.0 (git+https://github.com/ethcore/rust-rocksdb)",
@@ -1076,7 +1076,7 @@ dependencies = [
 [[package]]
 name = "rocksdb-sys"
 version = "0.3.0"
-source = "git+https://github.com/ethcore/rust-rocksdb#9be41e05923616dfa28741c58b22776d479751e6"
+source = "git+https://github.com/ethcore/rust-rocksdb#6472a9dce16c267a3acec2ee6fd01d1bf8de4913"
 dependencies = [
  "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/util/src/kvdb.rs b/util/src/kvdb.rs
index 8a19e48bf..f6d25ae51 100644
--- a/util/src/kvdb.rs
+++ b/util/src/kvdb.rs
@@ -17,8 +17,8 @@
 //! Key-Value store abstraction with `RocksDB` backend.
 
 use std::default::Default;
-use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector, DBIterator,
-	IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};
+use rocksdb::{DB, Writable, WriteBatch, WriteOptions, IteratorMode, DBVector, DBIterator,
+	IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction, Cache};
 
 const DB_BACKGROUND_FLUSHES: i32 = 2;
 const DB_BACKGROUND_COMPACTIONS: i32 = 2;
@@ -144,6 +144,7 @@ impl<'a> Iterator for DatabaseIterator {
 /// Key-Value database.
 pub struct Database {
 	db: DB,
+	write_opts: WriteOptions,
 }
 
 impl Database {
@@ -169,36 +170,28 @@ impl Database {
 
 		opts.set_max_background_flushes(DB_BACKGROUND_FLUSHES);
 		opts.set_max_background_compactions(DB_BACKGROUND_COMPACTIONS);
-		if let Some(cache_size) = config.cache_size {
-			// half goes to read cache
-			opts.set_block_cache_size_mb(cache_size as u64 / 2);
-			// quarter goes to each of the two write buffers
-			opts.set_write_buffer_size(cache_size * 1024 * 256);
-		}
-		/*
-		opts.set_bytes_per_sync(8388608);
-		opts.set_disable_data_sync(false);
-		opts.set_block_cache_size_mb(1024);
-		opts.set_table_cache_num_shard_bits(6);
-		opts.set_max_write_buffer_number(32);
-		opts.set_write_buffer_size(536870912);
-		opts.set_target_file_size_base(1073741824);
-		opts.set_min_write_buffer_number_to_merge(4);
-		opts.set_level_zero_stop_writes_trigger(2000);
-		opts.set_level_zero_slowdown_writes_trigger(0);
-		opts.set_compaction_style(DBUniversalCompaction);
-		opts.set_max_background_compactions(4);
-		opts.set_max_background_flushes(4);
-		opts.set_filter_deletes(false);
-		opts.set_disable_auto_compactions(false);
-		*/
 
 		if let Some(size) = config.prefix_size {
 			let mut block_opts = BlockBasedOptions::new();
 			block_opts.set_index_type(IndexType::HashSearch);
 			opts.set_block_based_table_factory(&block_opts);
 			opts.set_prefix_extractor_fixed_size(size);
+			if let Some(cache_size) = config.cache_size {
+				block_opts.set_cache(Cache::new(cache_size * 1024 * 256));
+				opts.set_write_buffer_size(cache_size * 1024 * 256);
+			}
+		} else if let Some(cache_size) = config.cache_size {
+			let mut block_opts = BlockBasedOptions::new();
+			// half goes to read cache
+			block_opts.set_cache(Cache::new(cache_size * 1024 * 256));
+			opts.set_block_based_table_factory(&block_opts);
+			// quarter goes to each of the two write buffers
+			opts.set_write_buffer_size(cache_size * 1024 * 256);
 		}
+
+		let mut write_opts = WriteOptions::new();
+		write_opts.disable_wal(true);
+
 		let db = match DB::open(&opts, path) {
 			Ok(db) => db,
 			Err(ref s) if s.starts_with("Corruption:") => {
@@ -209,7 +202,7 @@ impl Database {
 			},
 			Err(s) => { return Err(s); }
 		};
-		Ok(Database { db: db })
+		Ok(Database { db: db, write_opts: write_opts, })
 	}
 
 	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten.
@@ -224,7 +217,7 @@ impl Database {
 
 	/// Commit transaction to database.
 	pub fn write(&self, tr: DBTransaction) -> Result<(), String> {
-		self.db.write(tr.batch)
+		self.db.write_opt(tr.batch, &self.write_opts)
 	}
 
 	/// Get value by key.