Remove caching for now