Corrects segment calculations and adds cacheObserver