added TODO for caching cleanup