Cache optimization & tests extension