Return image from disk if key not present in memory cache. Closes #6

Can someone check the tests? I think they are not working the way they should for me
This looks like a merge conflict. It was moved to DiskCache in a previous commit.