Fix local source cache key backport

Tristan Van Berkomrequested to merge
fix-local-source-cache-key-backport into bst-1.0

Backporting patch !217 (merged) to stable branch.

Merge request reports