fix cache problems