- added custom key cashing