diff --git a/src/db.c b/src/db.c
index 8684bb1ab0b7e9bca7418dfbc157558ca065d014..9be26f865667a49c7e2b48eb72ec9f51a6e93549 100644
--- a/src/db.c
+++ b/src/db.c
@@ -36,14 +36,12 @@ robj *lookupKey(redisDb *db, robj *key) {
          * enabled we may have this key on disk. If so load it in memory
          * in a blocking way. */
         if (server.ds_enabled && cacheKeyMayExist(db,key)) {
-            if (cacheScheduleIOGetFlags(db,key) &
-                 (REDIS_IO_SAVE|REDIS_IO_SAVEINPROG))
-            {
+            if (cacheScheduleIOGetFlags(db,key) & REDIS_IO_SAVEINPROG) {
                 /* There is a save in progress for this object!
                  * Wait for it to get out. */
                 waitEmptyIOJobsQueue();
                 processAllPendingIOJobs();
-                redisAssert((cacheScheduleIOGetFlags(db,key) & (REDIS_IO_SAVE|REDIS_IO_SAVEINPROG)) == 0);
+                redisAssert((cacheScheduleIOGetFlags(db,key) & REDIS_IO_SAVEINPROG) == 0);
             }
 
             redisLog(REDIS_DEBUG,"Force loading key %s via lookup",
diff --git a/src/dscache.c b/src/dscache.c
index f6380703323aa96159234df6f6ad4f080a5b14ff..511425dc7e81b48bf7512b946e0641ac6d9c7701 100644
--- a/src/dscache.c
+++ b/src/dscache.c
@@ -115,6 +115,9 @@
  *   data from disk that should instead be deleted.
  *
  * - dsSet() use rename(2) in order to avoid corruptions.
+ *
+ * - Don't add a LOAD if there is already a LOADINPROGRESS, or is this
+ *   impossible since anyway the io_keys stuff will work as lock?
  */
 
 /* Virtual Memory is composed mainly of two subsystems:
diff --git a/tests/assets/default.conf b/tests/assets/default.conf
index 15d70ffbde875b79f686bc7a645517317e730d79..8113e157c58065bc94955be2cc95ce72f0b3a759 100644
--- a/tests/assets/default.conf
+++ b/tests/assets/default.conf
@@ -206,62 +206,10 @@ appendfsync everysec
 # To enable VM just set 'vm-enabled' to yes, and set the following three
 # VM parameters accordingly to your needs.
 
-vm-enabled no
-# vm-enabled yes
-
-# This is the path of the Redis swap file. As you can guess, swap files
-# can't be shared by different Redis instances, so make sure to use a swap
-# file for every redis process you are running. Redis will complain if the
-# swap file is already in use.
-#
-# The best kind of storage for the Redis swap file (that's accessed at random) 
-# is a Solid State Disk (SSD).
-#
-# *** WARNING *** if you are using a shared hosting the default of putting
-# the swap file under /tmp is not secure. Create a dir with access granted
-# only to Redis user and configure Redis to create the swap file there.
-vm-swap-file redis.swap
-
-# vm-max-memory configures the VM to use at max the specified amount of
-# RAM. Everything that deos not fit will be swapped on disk *if* possible, that
-# is, if there is still enough contiguous space in the swap file.
-#
-# With vm-max-memory 0 the system will swap everything it can. Not a good
-# default, just specify the max amount of RAM you can in bytes, but it's
-# better to leave some margin. For instance specify an amount of RAM
-# that's more or less between 60 and 80% of your free RAM.
-vm-max-memory 0
-
-# Redis swap files is split into pages. An object can be saved using multiple
-# contiguous pages, but pages can't be shared between different objects.
-# So if your page is too big, small objects swapped out on disk will waste
-# a lot of space. If you page is too small, there is less space in the swap
-# file (assuming you configured the same number of total swap file pages).
-#
-# If you use a lot of small objects, use a page size of 64 or 32 bytes.
-# If you use a lot of big objects, use a bigger page size.
-# If unsure, use the default :)
-vm-page-size 32
-
-# Number of total memory pages in the swap file.
-# Given that the page table (a bitmap of free/used pages) is taken in memory,
-# every 8 pages on disk will consume 1 byte of RAM.
-#
-# The total swap size is vm-page-size * vm-pages
-#
-# 32M swap should be enough for testing.
-vm-pages 1048576
-
-# Max number of VM I/O threads running at the same time.
-# This threads are used to read/write data from/to swap file, since they
-# also encode and decode objects from disk to memory or the reverse, a bigger
-# number of threads can help with big objects even if they can't help with
-# I/O itself as the physical device may not be able to couple with many
-# reads/writes operations at the same time.
-#
-# The special value of 0 turn off threaded I/O and enables the blocking
-# Virtual Memory implementation.
-vm-max-threads 4
+diskstore-enabled yes
+diskstore-path redis.ds
+cache-max-memory 0
+cache-flush-delay 0
 
 ############################### ADVANCED CONFIG ###############################