Added chache stuff