Issue #2357137 by eshta: Clear option set cache upon option set delete.