Make move cache less precise
Revert "Make move cache less precise"

This reverts commit 2edaa5888c48c51b21394c166ab281378c03e64c.