Added local caching for customers