Switch to tracking the folder ID that is cacheable, so that switching between accounts does not trigger caching non-default accounts