Use the more stringent check for cache location change