Updated Cache to behave more like the Ruby client