stopped caching some some stuff