Move CacheHelper to includes/cache/ folder

Change-Id: I13c9cf1be7fe0d436ea1a5d23f162abac7d97a29