This simplifies cache referencing and also paves the way for removing more from the app git directory. Refs #1558