remove cache and use Stores for tasks