Added cache back properly