[PLAT-4992] Remove "not-null" constraint
[PLAT-5170] Include data time in cache key