Trying ONE MORE TIME to cache data file quries properly. ...They still weren't working with the last commit, even without the ancestry to worry about.