Added local cache of Storage objects