some fixes about cache