Updated tests and rest context to reflect new cache