Merge pull request #646 from billhollings/master

Quick fixes for pipeline cache lookups.