Revert "Invalidate the token option cache"

This reverts commit 61884f7b20cb68351daac8bcfe7841c1318873a8.