Merge "Make getCacheSetOptions() and WAN cache handle broken replication"