Fixed cache problem with setup