Revert "no more tracking"

This reverts commit 81dabebf849d03b8cf4032e7939c82ef01e77d3b.
enabled caching