fix(tests): Bump timeout to 15 minutes, update cache behavior

fix(tests): Bump timeout to 15 minutes, update cache behavior #821