Fix: Cache clearing did not work properly