Move cache keys to Constants