Merge "Add cache for Account Visibility values."