comment cleanup, caching test