Add stop caching.