Minor formating fixes and cache key fix