Reworked removal of player cache during disable.