#8 - Get rid of strong dependency of in-memory-storage in driver