updated for caching on startup