Revert "Amit : moving to the cache philosophy"

This reverts commit 014847c3cdd192dfd05b56f0262f9766a95c22e5.