fix cacheing things