Refactor cache control usage
Update session start