Revert "(Bug 45973) Fix check for avoiding re-cache"

Revert unreviewed self-merge with pending issues.

This reverts commit f5422cf85a261c47c21dcc2699ccc1bbf1eea029.

Change-Id: I17471e2adccf54b79a9d8185c4a6f4b6937ce622