ADDED - 
1. iCache implementation
2. Other minor formating