Merge in bitmapcache. Refs #291