Endpoint check and revert cache fix