Fix cache & log