Various changes to JBig2 cache: