daveg: changing the caching? check to be a bit more explicit