Start on API expansion. Cache system introduced.