Make use of dabase cache

Change-Id: I529631b05e961c73662eb5f0f7ef4d946933b150