Creating new image cache with additional support for disk.
Refactor.
Cleanup.
Cleanup.
Refactor.
Cleanup.