Attempt #2 at #399 (use local cache)

This one doesn't break the default locations to the best of my knowledge.