Check for both cache keys, close #715.