removing caching for now