next version - cache reworked

Change-Id: Ie8c799411ef9e30ece3424c96abf616b18f98ee3