Move accountid to the cache
Reduce the scope of the NS ACCOUNT command