Fix some unit tests by not using transactions
Introduce StoreCached