Better naming and no unnecessary lambda on cache time