Refactor CachingManagingDrawTask