committing caching system

Change-Id: I359d04d8205a2f471ef9ef8d5035418a4cf667e0