Fix #1890 "NPE with low XForms cache size"