Move cache location methods so they are available in all builds