ADDED - 
1. iCache moved to a separate package iCache