updates for recent changes in bitmap caching