Ensure stop works when caching is turned off