Added data caching and getting data module