Add Key and Entity datastructures
Migrate interfaces for Cache and Datastore