We need this for cache monitoring features to work out of the box. Change-Id: I1d145a7e869416e6c0fe0133d94d126f740db016