[4.2] Cache Repository Refactor To Avoid "return $value" Twice