Switch to the cacheKey CacheLookup syntax.
Add delta based entity.
Comment and fix importing.
Fix type conversion error.