removing android dependencies from caching model ( wip - not tests )