Fixed issue #401 #429 : This fixes cache delete issue