Move caching logic to shell script - don't always needlessly build/save image when we already have it
Add times