less intrusive cache prevention.

more tests.