Store org info in cache filename.
Make sure the workspace caches are up to date.