Use consistant cache key for swift pollster

Change-Id: I7a3a8a7f80d1f6c39ba4da5ccef4122b4badc6ec
Merge "Use consistant cache key for swift pollster"