Add org key to service cache key for client testing