More robust agent cache data removal