Add support for get + lock / get + touch

Change-Id: I86425c79ab547b45cf3181524a41fdab8407667c