Merge "Cache mechanism for Storage page" into tm-dev