diff --git a/buildman/jobutil/buildjob.py b/buildman/jobutil/buildjob.py
index 46dab931c..1710c3aab 100644
--- a/buildman/jobutil/buildjob.py
+++ b/buildman/jobutil/buildjob.py
@@ -108,14 +108,17 @@ class BuildJob(object):
         return False
 
       full_command = '["/bin/sh", "-c", "%s"]' % cache_commands[step]
-      return image.storage.comment == full_command
+      logger.debug('Checking step #%s: %s, %s == %s', step, image.id,
+                   image.storage.command, full_command)
+
+      return image.storage.command == full_command
 
     path = tree.find_longest_path(base_image.id, checker)
     if not path:
       return None
 
     # Find any tag associated with the last image in the path.
-    return tree.tag_containing_images(path[-1])
+    return tree.tag_containing_image(path[-1])
 
 
   def _determine_cached_tag_by_tag(self):