Refactor for bitmap cache.