Updated to cache from the dumps rather than use the triplestore (it's *much* faster)