Fix KEY_CONTENT_LOCATION issue (crawl cache)
Implements #704
Merge pull request #707 from emmanuel-keller/master

Bug fix