refactor predicate cache into its own class

Change-Id: Idc796fcc2939a5eacb21df30ea46b737c0d12bb9
2 files changed