Changed order of Remove and Forget in the Cache
Closes #109