Revert "disable caching for testing purpose"

This reverts commit 511713e5de61c0064322d0dcc1bd350f0ef3da44.