Better cache check