6fbe0e27ca
The cache is typically supposed to be non-null, but I did observe that in testing, and the null check doesn't really hurt here.