Fix issue #127 + a few other minor updates.

Can we also name it "key" to be consistent with CacheProvider?