Merge "LSS: check whether to cache SP in handler"