post refactor fixups around bitmap caching and callbacks