Merge "Fix incorrect cache checking of string config values"