Some pre-work form snapshotting
Remove entryIndex sentinel value and add check instead
Removed unneeded function and instead use cache as function
Fixes $8