fix cache system