Fix cache issue