Removed unnecessary unless clause and threading while recaching