Revert "Delayed adding drawable"

This reverts commit 929a55ca059e0805626d8674cfed26d215b55c59.
Recommitting a change after the revert.

Didn't need the callback, but did need the cache check.