took out caching altogether