Fix Org Status Caching