removal of return with double ref
Merge branch 'cache_vault' into vault