Cleanup and remove random cache usage