remove caching, we probably dont need it