Replace cache with new API FromCache()