Fixed unnecessary cache clearing