Added local data caching