Cache fix and finder tests