Added rhombus statement cache back