Fix cache set/get methods