Revert "Add extra checks in XCache-calls to prevent fatals"

This reverts commit 180f1dde97487caaf489496fe0e602850ed54f53.