Merge "Change warning logic in preopt2cachename"