If we're about to take the cache entry (because there wasn't a primary
entry), and it was removed, skip past it to whatever other entries appear
in the cache.
Rework KEY_APP/VALUE_APP handling to match the changes that will soon
be in the develop branch, clean up reset handling.