better cache and objects

Change-Id: If0aa45530bc3c57b89bc8d2a67086df3006ef88f