squashed a caching bug