Time estimate cleanup

cleaned up time estimate cache to make it a little more readable
made the time estimate reload more efficient (~200 lookups vs ~500,000)