Fix cache not destroyed