Added proper cache reset