Minor cleanup
Modified certain cache keys to be more specific, avoid accidental cache hits