fix cache leakage