issue #22782: clean up the rest of bicache