Some additional renames in timestamp cache and also a fix to not cache

timestamps earlier than the high water mark. This doesn't affect
correctness, just is slightly more efficient. No need to cache old
timestamps (e.g. from historical reads).