Remove cache statement 21 buck merged