Fix Set and improve WriteCache