Progress on fixing bitmap caching