Added a map for reference
Adding cache concept