Bunch of reformatting. Fix issue with session termination.
FInish cache validation.