Revert "Updated for cache change on the fly"

This reverts commit 4f2b4aa67874be85af7a015dede95998a0a1ecf6.