Fix CachedName saving
Reorganize rpc tests