remove manual caching