EZP-21125: fixed null return value being cached