Merge "Change getCacheSetOptions() callers to use "Database""