Adding compatibility for Mask modifier on Cache