Adding timestamp caching