Refactoring of GAIA cache functions
Merge pull request #32 from MikeMatrix/feature/gaia-cache-code-cleanup

Refactoring of GAIA cache functions